Просмотр исходного кода

Use a rotate safe file writer if the config file specifies a log path

Michael Goldberger 9 лет назад
Родитель
Сommit
efd883d5d9
1 измененных файлов с 5 добавлено и 3 удалено
  1. 5 3
      psiphon/server/log.go

+ 5 - 3
psiphon/server/log.go

@@ -28,6 +28,7 @@ import (
 	"os"
 
 	"github.com/Psiphon-Inc/logrus"
+	"github.com/Psiphon-Inc/rotate-safe-writer"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common"
 )
 
@@ -150,14 +151,15 @@ func InitLogging(config *Config) error {
 		return common.ContextError(err)
 	}
 
-	logWriter := os.Stderr
+	var logWriter io.Writer
 
 	if config.LogFilename != "" {
-		logWriter, err = os.OpenFile(
-			config.LogFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0666)
+		logWriter, err = rotate.NewRotatableFileWriter(config.LogFilename, 0666)
 		if err != nil {
 			return common.ContextError(err)
 		}
+	} else {
+		logWriter = os.Stderr
 	}
 
 	log = &ContextLogger{