bug fix

ffay · Nov 28, 2017 · 76f08a6 · 76f08a6
1 parent ff18202
commit 76f08a6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/main/handler.go b/src/main/handler.go
@@ -83,7 +83,9 @@ func (connHandler *ConnHandler) Listen(conn net.Conn, messageHandler interface{}
 }
 
 func (connHandler *ConnHandler) Write(msg interface{}) {
-	buf := connHandler.messageHandler.Encode(msg)
-	connHandler.WriteTime = time.Now().Unix()
-	connHandler.conn.Write(buf)
+	if connHandler.messageHandler != nil {
+		buf := connHandler.messageHandler.Encode(msg)
+		connHandler.WriteTime = time.Now().Unix()
+		connHandler.conn.Write(buf)
+	}
 }
diff --git a/src/main/main.go b/src/main/main.go
@@ -263,6 +263,13 @@ func (messageHandler *LPMessageHandler) ConnError(connHandler *ConnHandler) {
 	if messageHandler.die != nil {
 		close(messageHandler.die)
 	}
+
+	if connHandler.NextConn != nil {
+		connHandler.NextConn.NextConn = nil
+		connHandler.NextConn.conn.Close()
+		connHandler.NextConn = nil
+	}
+
 	connHandler.messageHandler = nil
 	messageHandler.connHandler = nil
 	time.Sleep(time.Second * 3)

diff --git a/src/main/realserver_handler.go b/src/main/realserver_handler.go
@@ -59,6 +59,8 @@ func (messageHandler *RealServerMessageHandler) ConnError(connHandler *ConnHandl
 		conn.Write(message)
 		conn.NextConn = nil
 	}
+
+	connHandler.messageHandler = nil
 }
 
 func (messageHandler *RealServerMessageHandler) ConnFailed() {