1
This commit is contained in:
@@ -43,7 +43,7 @@ func ListenTcp() {
|
||||
}
|
||||
}()
|
||||
|
||||
if err := handleConn(c); err != nil {
|
||||
if err = handleConn(c); err != nil {
|
||||
c.Close()
|
||||
Pool.Wait()
|
||||
Pool.Stop()
|
||||
@@ -61,11 +61,11 @@ func handleConn(c net.Conn) error {
|
||||
for {
|
||||
buffer, n, err := ConnRead(c)
|
||||
|
||||
remoteAddr := c.RemoteAddr().(*net.TCPAddr)
|
||||
remoteIP := remoteAddr.IP.String() // 打印机IP
|
||||
remotePort := remoteAddr.Port // 打印机端口
|
||||
globals.SugarLogger.Debugf("remoteIP1: %s", remoteIP)
|
||||
globals.SugarLogger.Debugf("remotePort1: %d", remotePort)
|
||||
//remoteAddr := c.RemoteAddr().(*net.TCPAddr)
|
||||
//remoteIP := remoteAddr.IP.String() // 打印机IP
|
||||
//remotePort := remoteAddr.Port // 打印机端口
|
||||
//globals.SugarLogger.Debugf("remoteIP1: %s", remoteIP)
|
||||
//globals.SugarLogger.Debugf("remotePort1: %d", remotePort)
|
||||
|
||||
// 重连
|
||||
if err != nil {
|
||||
@@ -74,9 +74,6 @@ func handleConn(c net.Conn) error {
|
||||
} else {
|
||||
fmt.Println("ReadString err:", err)
|
||||
}
|
||||
printRemoteAddr22 := c.RemoteAddr().String()
|
||||
printRemoteAddr22 = strings.Split(printRemoteAddr22, ":")[0]
|
||||
globals.SugarLogger.Debugf("printRemoteAddr22: %s", printRemoteAddr22)
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -98,12 +95,14 @@ func handleConn(c net.Conn) error {
|
||||
}
|
||||
globals.SugarLogger.Debugf("printNoData------: %s", printNo)
|
||||
|
||||
if value, have := TcpClientList.Load(printNo); !have {
|
||||
t = NewTcpClient()
|
||||
TcpClientList.Store(printNo, t)
|
||||
} else {
|
||||
t = value.(*TcpClient)
|
||||
}
|
||||
t = NewTcpClient()
|
||||
TcpClientList.Delete(printNo)
|
||||
TcpClientList.Store(printNo, t)
|
||||
//if value, have := TcpClientList.Load(printNo); !have {
|
||||
// TcpClientList.Store(printNo, t)
|
||||
//} else {
|
||||
// t = value.(*TcpClient)
|
||||
//}
|
||||
if heartbeat {
|
||||
// 证明是心跳
|
||||
Heartbeat(c, t, data, printNo, "")
|
||||
|
||||
Reference in New Issue
Block a user