Merge pull request #849 from comin2013/master

日志文件名优化

cluster/cluster.go

@@ -231,3 +231,7 @@ func (cls *Cluster) triggerRpcEvent (bConnect bool,nodeId int) {
 	}
 }
 
+func (cls *Cluster) GetLocalNodeInfo() *NodeInfo {
+	return &cls.localNodeInfo
+}
+

log/log.go

@@ -34,6 +34,7 @@ const (
 
 type Logger struct {
 	filePath   string
+	filepre 	string
 	logTime    time.Time
 	level      int
 	stdLogger   *log.Logger
@@ -42,7 +43,7 @@ type Logger struct {
 	flag       int
 }
 
-func New(strLevel string, pathname string, flag int) (*Logger, error) {
+func New(strLevel string, pathname string, filepre string, flag int) (*Logger, error) {
 	// level
 	var level int
 	switch strings.ToLower(strLevel) {
@@ -75,7 +76,7 @@ func New(strLevel string, pathname string, flag int) (*Logger, error) {
 			now.Minute(),
 			now.Second())
 
-		file, err := os.Create(path.Join(pathname, filename))
+		file, err := os.Create(path.Join(pathname, filepre+filename))
 		if err != nil {
 			return nil, err
 		}
@@ -95,6 +96,7 @@ func New(strLevel string, pathname string, flag int) (*Logger, error) {
 	logger.logTime = now
 	logger.filePath = pathname
 	logger.flag = flag
+	logger.filepre = filepre
 
 	return logger, nil
 }
@@ -128,7 +130,7 @@ func (logger *Logger) doPrintf(level int, printLevel string, format string, a ..
 				now.Minute(),
 				now.Second())
 
-			file, err := os.Create(path.Join(logger.filePath, filename))
+			file, err := os.Create(path.Join(logger.filePath, logger.filepre+filename))
 			if err == nil {
 				logger.baseFile.Close()
 				logger.baseLogger = log.New(file, "", logger.flag)
@@ -172,7 +174,7 @@ func (logger *Logger) Fatal(format string, a ...interface{}) {
 	logger.doPrintf(fatalLevel, printFatalLevel, format, a...)
 }
 
-var gLogger, _ = New("debug", "", log.LstdFlags|log.Lshortfile)
+var gLogger, _ = New("debug", "", "", log.LstdFlags|log.Lshortfile)
 
 // It's dangerous to call the method on logging
 func Export(logger *Logger) {

node/node.go

@@ -134,6 +134,11 @@ func initNode(id int){
 		log.Fatal("read system config is error %+v",err)
 	}
 
+	err = initLog()
+	if err != nil{
+		return
+	}
+
 	//2.setup service
 	for _,s := range preSetupService {
 		//是否配置的service
@@ -156,7 +161,9 @@ func initLog() error{
 		setLogPath("./log")
 	}
 
-	logger,err := log.New(logLevel,logPath,slog.LstdFlags|slog.Lshortfile)
+	localnodeinfo := cluster.GetCluster().GetLocalNodeInfo()
+	filepre := fmt.Sprintf("%s[%d]", localnodeinfo.NodeName, localnodeinfo.NodeId)
+	logger,err := log.New(logLevel,logPath,filepre,slog.LstdFlags|slog.Lshortfile)
 	if err != nil {
 		fmt.Printf("cannot create log file!\n")
 		return err
@@ -220,11 +227,6 @@ func startNode(args interface{}) error{
 		return fmt.Errorf("invalid option %s",param)
 	}
 
-	err = initLog()
-	if err != nil {
-		return err
-	}
-
 	timer.StartTimer(10*time.Millisecond,100000)
 	log.Release("Start running server.")
 	//2.初始化node
@@ -285,7 +287,7 @@ func GetConfigDir() string {
 }
 
 func SetSysLog(strLevel string, pathname string, flag int){
-	logs,_:= log.New(strLevel,pathname,flag)
+	logs,_:= log.New(strLevel,pathname, "", flag)
 	log.Export(logs)
 }