Bläddra i källkod

update debug log

dujunchen 1 månad sedan
förälder
incheckning
ddf5ec1788
4 ändrade filer med 22 tillägg och 15 borttagningar
  1. 4 3
      internal/app/index.go
  2. 8 8
      internal/app/stc/index.go
  3. 4 3
      internal/app/stc/socket/index.go
  4. 6 1
      pkg/utils/file.go

+ 4 - 3
internal/app/index.go

@@ -16,18 +16,19 @@ func StartApp() {
 	time.Sleep(2 * time.Second)
 	//init asterisk
 	if !utils.CheckAsterisk() {
-		lfshook.NewLogger().Infof("Check asterisk , if not running , run cmd /usr/sbin/asterisk !")
+		utils.LoggerDebug.Printf("Asterisk not running , run cmd /usr/sbin/asterisk !")
+
 		utils.ExecCmdAsync("/usr/sbin/asterisk")
 		time.Sleep(3 * time.Second)
 	}
 	if utils.CheckAsterisk() {
-		lfshook.NewLogger().Infof("===== asterisk Running=======")
+		utils.LoggerDebug.Printf("Check asterisk , Asterisk is running !")
 	}
 
 	//Get cab number acording to IP
 	socket.SetMasterCabNum()
 
-	lfshook.NewLogger().Infof("============ Get cab number:%s  Master:%+v", active.CabNum, active.Master)
+	utils.LoggerDebug.Printf("Get CabNumber:%s  Master:%+v", active.CabNum, active.Master)
 
 	//init the active status
 	//active.ActivedCab = ""

+ 8 - 8
internal/app/stc/index.go

@@ -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
 		}
 	}

+ 4 - 3
internal/app/stc/socket/index.go

@@ -5,6 +5,7 @@ import (
 	"net"
 	"pbx-api-gin/internal/app/stc/active"
 	"pbx-api-gin/pkg/lfshook"
+	"pbx-api-gin/pkg/utils"
 	"time"
 )
 
@@ -25,7 +26,7 @@ const RemoteAddr8 = "10.0.11.81"
 
 func IsIPExists(targetIP string) (bool, error) {
 	// 解析目标 IP
-	//lfshook.NewLogger().Logger.Infof("========targetIP=========%s", targetIP)
+	utils.LoggerDebug.Printf("Checking device IP , Set CabNumber ......")
 	ip := net.ParseIP(targetIP)
 	if ip == nil {
 		return false, fmt.Errorf("invalid IP address: %s", targetIP)
@@ -62,7 +63,7 @@ func SetMasterCabNum() {
 getIP:
 	ext1, err := IsIPExists("10.0.11.11")
 	if err != nil {
-		lfshook.NewLogger().Infof("Check IP 10.0.11.11 err :%+v", err)
+		utils.LoggerDebug.Printf("Check IP 10.0.11.11 err :%+v", err)
 	}
 	// Init cab1 number and master role
 	if ext1 {
@@ -73,7 +74,7 @@ getIP:
 
 	ext8, err := IsIPExists("10.0.11.81")
 	if err != nil {
-		lfshook.NewLogger().Infof("Check IP 10.0.11.81 err:%+v", err)
+		utils.LoggerDebug.Printf("Check IP 10.0.11.81 err:%+v", err)
 	}
 	// Init cab8 number and master role
 	if ext8 {

+ 6 - 1
pkg/utils/file.go

@@ -147,12 +147,17 @@ func WriteLogToFile(message string) {
 }
 
 var Logger *log.Logger
+var LoggerDebug *log.Logger
 
 func init() {
 	file, _ := os.OpenFile("/data/test/log/recordEvent.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
 	//Logger = log.New(file, "", log.LstdFlags) // 自动带时间戳
 	Logger = log.New(file, "", log.LstdFlags|log.Lmicroseconds)
-	lfshook.NewLogger().Printf("software version: V10.01")
+	//lfshook.NewLogger().Printf("software version: V10.01")
+
+	fileDebug, _ := os.OpenFile("/data/test/log/debug.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
+	//Logger = log.New(file, "", log.LstdFlags) // 自动带时间戳
+	LoggerDebug = log.New(fileDebug, "", log.LstdFlags|log.Lmicroseconds)
 }
 
 func GetPadInfo(base string) (padType, padNum, connectedCab string) {