Optimize code of util and logging to avoid circular dependency

Signed-off-by: Eric Zhao <[email protected]>

Author: sczyh30

logging/logging.go

@@ -2,7 +2,6 @@ package logging
 
 import (
 	"fmt"
-	"github.com/sentinel-group/sentinel-golang/util"
 	"log"
 	"os"
 	"sync"
@@ -54,9 +53,11 @@ func GetDefaultLogger() *SentinelLogger {
 
 // outputFile is the full path(absolute path)
 func NewSentinelFileLogger(outputFile, namespace string, flag int) *SentinelLogger {
-	var logFile *os.File
 	logDir := addSeparatorIfNeeded(LogBaseDir())
-	util.CreateDirIfNotExists(logDir)
+	err := createDirIfNotExists(logDir)
+	if err != nil {
+		log.Printf("Failed to create the log directory: %+v", err)
+	}
 	logFile, err := os.OpenFile(logDir+outputFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0777)
 	if err != nil {
 		// TODO: do not fatal here
@@ -68,6 +69,17 @@ func NewSentinelFileLogger(outputFile, namespace string, flag int) *SentinelLogg
 	}
 }
 
+func createDirIfNotExists(dirname string) error {
+	if _, err := os.Stat(dirname); err != nil {
+		if os.IsNotExist(err) {
+			return os.MkdirAll(dirname, os.ModePerm)
+		} else {
+			return err
+		}
+	}
+	return nil
+}
+
 type Logger interface {
 	Debug(v ...interface{})
 	Debugf(format string, v ...interface{})

util/auto_recover.go

@@ -5,11 +5,11 @@ import (
 	"github.com/sentinel-group/sentinel-golang/logging"
 )
 
-func WithRecoverGo(f func(), logger *logging.SentinelLogger) {
+func RunWithRecover(f func(), logger *logging.SentinelLogger) {
 	defer func() {
 		if err := recover(); err != nil {
-			logger.Errorf("Panic:%+v.", errors.Errorf("%+v", err))
+			logger.Errorf("Unexpected panic: %+v", errors.Errorf("%+v", err))
 		}
 	}()
 	f()
-}
+}

util/util_test.go

@@ -6,7 +6,7 @@ import (
 )
 
 func TestWithRecoverGo(t *testing.T) {
-	go WithRecoverGo(func() {
+	go RunWithRecover(func() {
 		panic("internal error!\n")
 	}, logging.GetDefaultLogger())
-}
+}