diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go index 249fefb5c..462821577 100644 --- a/business/jxstore/event/event_tcp.go +++ b/business/jxstore/event/event_tcp.go @@ -51,6 +51,8 @@ func ListenTcp() { t := NewTcpClient() if err := handleConn(c, t); err != nil { t = nil + Poll.Wait() + Poll.Stop() return } } @@ -229,7 +231,6 @@ func HandleTcpMessages(t *TcpClient, printNo string) { } } else { globals.SugarLogger.Debugf("HandleTcpMessages timeout") - t = nil //Poll.Stop() return } @@ -283,8 +284,6 @@ func doPrint(t *TcpClient, key string) (err error) { case printMsg, ok := <-t.MsgMap[key]: if !ok { globals.SugarLogger.Debugf("doPrint err !ok ...") - t = nil - //Poll.Stop() return } var ( @@ -299,10 +298,6 @@ func doPrint(t *TcpClient, key string) (err error) { case printerStatusOnline: if c = t.getPrintConn(printMsg.PrintNo); c != nil { data, err = buildMsg(printMsg) - globals.SugarLogger.Debugf("=================printMsg : %s", utils.Format4Output(printMsg, false)) - globals.SugarLogger.Debugf("=================PrintNo : %s", printMsg.PrintNo) - globals.SugarLogger.Debugf("=================data : %s", string(data)) - globals.SugarLogger.Debugf("=================err : %s", utils.Format4Output(err, false)) } case printerStatusOffline: err = fmt.Errorf("打印机离线!") @@ -323,7 +318,6 @@ func doPrint(t *TcpClient, key string) (err error) { globals.SugarLogger.Debugf("handleTcpMessages err [%v]", err) //close(t.TimeoutMap[key]) delete(t.TimeoutMap, key) - t = nil } else { //等待回调 dataStr := <-t.CallBackMap[key] @@ -372,8 +366,6 @@ func doPrint(t *TcpClient, key string) (err error) { } } } else { - t = nil - //Poll.Stop() globals.SugarLogger.Debugf("doPrint timeout") return } @@ -488,8 +480,8 @@ func HandleCheckTcpHeart(t *TcpClient, key string) { if time.Now().Sub(statusTime) > time.Second*70 { globals.SugarLogger.Debugf("超过一分十秒没有心跳的打印机[%s]", key) changePrinterStatus(key, printerStatusOffline) - t = nil delete(t.TimeoutMap, key) + globals.SugarLogger.Debugf("t := %s", utils.Format4Output(t.Clients[key].StatusTime, false)) } } } else { @@ -497,7 +489,6 @@ func HandleCheckTcpHeart(t *TcpClient, key string) { close(t.MsgMap[key]) close(t.CallBackMap[key]) t.delConn(key) - t = nil return } }