websocket: fix double disconnect handler for incomer

Author: safchain

topology/probes/ovsdb/ovs_of.go

@@ -310,7 +310,9 @@ func makeFilter(rule *Rule) string {
 // Execute exposes an interface to command launch on the OS
 type Execute interface {
 	ExecCommand(string, ...string) ([]byte, error)
-	ExecCommandPipe(context.Context, string, ...string) (io.Reader, interface{ Wait() error }, error)
+	ExecCommandPipe(context.Context, string, ...string) (io.Reader, interface {
+		Wait() error
+	}, error)
 }
 
 // RealExecute is the actual implementation given below. It can be overridden for tests.
@@ -326,7 +328,9 @@ func (r RealExecute) ExecCommand(com string, args ...string) ([]byte, error) {
 }
 
 // ExecCommandPipe executes a command on a host and gives back a pipe to control it.
-func (r RealExecute) ExecCommandPipe(ctx context.Context, com string, args ...string) (io.Reader, interface{ Wait() error }, error) {
+func (r RealExecute) ExecCommandPipe(ctx context.Context, com string, args ...string) (io.Reader, interface {
+	Wait() error
+}, error) {
 	/* #nosec */
 	command := exec.CommandContext(ctx, com, args...)
 	out, err := command.StdoutPipe()

topology/probes/ovsdb/ovs_of_test.go

@@ -193,7 +193,9 @@ func (r ExecuteForTest) ExecCommand(com string, args ...string) ([]byte, error)
 	return []byte(result), nil
 }
 
-func (r ExecuteForTest) ExecCommandPipe(ctx context.Context, com string, args ...string) (io.Reader, interface{ Wait() error }, error) {
+func (r ExecuteForTest) ExecCommandPipe(ctx context.Context, com string, args ...string) (io.Reader, interface {
+	Wait() error
+}, error) {
 	return strings.NewReader(r.Flow), r, nil
 }
 

websocket/client.go

@@ -536,11 +536,6 @@ func (c *Client) Connect() error {
 		l.OnConnected(c)
 	}
 
-	// in case of a handler disconnect the client directly
-	if !c.IsConnected() {
-		return errors.New("Aborting connection to the server")
-	}
-
 	return nil
 }
 
@@ -549,7 +544,10 @@ func (c *Client) Start() {
 	go func() {
 		for c.running.Load() == true {
 			if err := c.Connect(); err == nil {
-				c.Run()
+				// in case of a handler disconnect the client directly
+				if c.IsConnected() {
+					c.Run()
+				}
 			} else {
 				logging.GetLogger().Error(err)
 			}

websocket/message.go

@@ -494,7 +494,6 @@ func (s *StructServer) OnConnected(c Speaker) {
 
 // OnDisconnected removes the Speaker from the incomer pool.
 func (s *StructServer) OnDisconnected(c Speaker) {
-	s.Server.incomerPool.RemoveClient(c)
 }
 
 // NewStructServer returns a new StructServer