|
|
@@ -8,7 +8,6 @@ import (
|
|
|
"pbx-api-gin/internal/app/stc/broadcast"
|
|
|
msgdata "pbx-api-gin/internal/app/stc/data"
|
|
|
"pbx-api-gin/internal/app/stc/socket"
|
|
|
- "pbx-api-gin/pkg/lfshook"
|
|
|
"pbx-api-gin/pkg/utils"
|
|
|
"sync"
|
|
|
"syscall"
|
|
|
@@ -17,7 +16,7 @@ import (
|
|
|
)
|
|
|
|
|
|
func StartStcConnection(conn net.Conn, cab string) {
|
|
|
- lfshook.NewLogger().Infof("Connect to STC%s ", cab)
|
|
|
+ utils.LoggerDebug.Printf("Starting Connect to STC%s ...", cab)
|
|
|
|
|
|
var connMux sync.Mutex // 保护 conn 的读写
|
|
|
var conn1 net.Conn
|
|
|
@@ -29,14 +28,15 @@ func StartStcConnection(conn net.Conn, cab string) {
|
|
|
conn1, err = CreateConnection(cab)
|
|
|
if err != nil || conn1 == nil {
|
|
|
time.Sleep(2 * time.Second)
|
|
|
- //lfshook.NewLogger().Logger.Infof("===========Reconnecting====To Cab:%s=======", cab)
|
|
|
+ utils.LoggerDebug.Printf("Reconnecting To Cab%s ......", cab)
|
|
|
continue
|
|
|
}
|
|
|
|
|
|
- trainInfo := fmt.Sprintf("CabNumber %s", active.ActivedCab)
|
|
|
//set connection log
|
|
|
+ trainInfo := fmt.Sprintf("CabNumber %s", active.ActivedCab)
|
|
|
if logTag == 0 {
|
|
|
utils.Logger.Printf("Train Information: %s, Message: Connection to Cab%s STC is up !", trainInfo, cab)
|
|
|
+ utils.LoggerDebug.Printf("Connection to Cab%s STC1 is up !", cab)
|
|
|
logTag = 1
|
|
|
}
|
|
|
|
|
|
@@ -111,7 +111,7 @@ func CreateConnection(RemoteCab string) (net.Conn, error) {
|
|
|
//lfshook.NewLogger().Logger.Infof("========Connect server err :%+v", err)
|
|
|
return nil, err
|
|
|
}
|
|
|
- lfshook.NewLogger().Logger.Infof("Connect success MC1:%s:%d", socket.RemoteAddr, socket.RemotePort)
|
|
|
+ utils.LoggerDebug.Printf("Connect success STC1:%s:%d from Cab1 !", socket.RemoteAddr, socket.RemotePort)
|
|
|
return conn, nil
|
|
|
} else { //in cab 8
|
|
|
dialer := &net.Dialer{
|
|
|
@@ -126,7 +126,7 @@ func CreateConnection(RemoteCab string) (net.Conn, error) {
|
|
|
//lfshook.NewLogger().Logger.Infof("========Connect server err :%+v", err)
|
|
|
return nil, err
|
|
|
}
|
|
|
- lfshook.NewLogger().Logger.Infof("Connect success MC1:%s:%d", socket.RemoteAddr, socket.RemotePort)
|
|
|
+ utils.LoggerDebug.Printf("Connect success STC1:%s:%d from Cab8 !", socket.RemoteAddr, socket.RemotePort)
|
|
|
return conn, nil
|
|
|
}
|
|
|
} else { // connect to MC8
|
|
|
@@ -145,7 +145,7 @@ func CreateConnection(RemoteCab string) (net.Conn, error) {
|
|
|
//lfshook.NewLogger().Logger.Infof("========Connect server err :%+v", err)
|
|
|
return nil, err
|
|
|
}
|
|
|
- lfshook.NewLogger().Logger.Infof("Connect success MC8:%s:%d", socket.RemoteAddr8, socket.RemotePort)
|
|
|
+ utils.LoggerDebug.Printf("Connect success STC8:%s:%d from Cab1 !", socket.RemoteAddr8, socket.RemotePort)
|
|
|
return conn, nil
|
|
|
} else { //in cab 8
|
|
|
dialer := &net.Dialer{
|
|
|
@@ -160,7 +160,7 @@ func CreateConnection(RemoteCab string) (net.Conn, error) {
|
|
|
//lfshook.NewLogger().Logger.Infof("========Connect server err :%+v", err)
|
|
|
return nil, err
|
|
|
}
|
|
|
- lfshook.NewLogger().Logger.Infof("Connect success MC8:%s:%d", socket.RemoteAddr8, socket.RemotePort)
|
|
|
+ utils.LoggerDebug.Printf("Connect success STC8:%s:%d from Cab8 !", socket.RemoteAddr8, socket.RemotePort)
|
|
|
return conn, nil
|
|
|
}
|
|
|
}
|