Sfoglia il codice sorgente

Windows: fix UTC time logging

Nicola Murino 4 anni fa
parent
commit
dfcfcee208
5 ha cambiato i file con 11 aggiunte e 2 eliminazioni
  1. 4 0
      cmd/install_windows.go
  2. 3 0
      cmd/portable.go
  3. 1 0
      cmd/start_windows.go
  4. 1 0
      docs/portable-mode.md
  5. 2 2
      service/service.go

+ 4 - 0
cmd/install_windows.go

@@ -31,6 +31,7 @@ Please take a look at the usage below to customize the startup options`,
 				LogMaxAge:     logMaxAge,
 				LogCompress:   logCompress,
 				LogVerbose:    logVerbose,
+				LogUTCTime:    logUTCTime,
 				Shutdown:      make(chan bool),
 			}
 			winService := service.WindowsService{
@@ -87,6 +88,9 @@ func getCustomServeFlags() []string {
 	if logVerbose != defaultLogVerbose {
 		result = append(result, "--"+logVerboseFlag+"=false")
 	}
+	if logUTCTime != defaultLogUTCTime {
+		result = append(result, "--"+logUTCTimeFlag+"=true")
+	}
 	if logCompress != defaultLogCompress {
 		result = append(result, "--"+logCompressFlag+"=true")
 	}

+ 3 - 0
cmd/portable.go

@@ -31,6 +31,7 @@ var (
 	portablePassword                   string
 	portableLogFile                    string
 	portableLogVerbose                 bool
+	portableLogUTCTime                 bool
 	portablePublicKeys                 []string
 	portablePermissions                []string
 	portableSSHCommands                []string
@@ -143,6 +144,7 @@ Please take a look at the usage below to customize the serving parameters`,
 				LogMaxAge:     defaultLogMaxAge,
 				LogCompress:   defaultLogCompress,
 				LogVerbose:    portableLogVerbose,
+				LogUTCTime:    portableLogUTCTime,
 				Shutdown:      make(chan bool),
 				PortableMode:  1,
 				PortableUser: dataprovider.User{
@@ -251,6 +253,7 @@ value`)
 value`)
 	portableCmd.Flags().StringVarP(&portableLogFile, logFilePathFlag, "l", "", "Leave empty to disable logging")
 	portableCmd.Flags().BoolVarP(&portableLogVerbose, logVerboseFlag, "v", false, "Enable verbose logs")
+	portableCmd.Flags().BoolVar(&portableLogUTCTime, logUTCTimeFlag, false, "Use UTC time for logging")
 	portableCmd.Flags().StringSliceVarP(&portablePublicKeys, "public-key", "k", []string{}, "")
 	portableCmd.Flags().StringSliceVarP(&portablePermissions, "permissions", "g", []string{"list", "download"},
 		`User's permissions. "*" means any

+ 1 - 0
cmd/start_windows.go

@@ -29,6 +29,7 @@ var (
 				LogMaxAge:     logMaxAge,
 				LogCompress:   logCompress,
 				LogVerbose:    logVerbose,
+				LogUTCTime:    logUTCTime,
 				Shutdown:      make(chan bool),
 			}
 			winService := service.WindowsService{

+ 1 - 0
docs/portable-mode.md

@@ -72,6 +72,7 @@ Flags:
       --gcs-storage-class string
   -h, --help                            help for portable
   -l, --log-file-path string            Leave empty to disable logging
+      --log-utc-time                    Use UTC time for logging
   -v, --log-verbose                     Enable verbose logs
   -p, --password string                 Leave empty to use an auto generated
                                         value

+ 2 - 2
service/service.go

@@ -69,8 +69,8 @@ func (s *Service) initLogger() {
 func (s *Service) Start() error {
 	s.initLogger()
 	logger.Info(logSender, "", "starting SFTPGo %v, config dir: %v, config file: %v, log max size: %v log max backups: %v "+
-		"log max age: %v log verbose: %v, log compress: %v, load data from: %#v", version.GetAsString(), s.ConfigDir, s.ConfigFile,
-		s.LogMaxSize, s.LogMaxBackups, s.LogMaxAge, s.LogVerbose, s.LogCompress, s.LoadDataFrom)
+		"log max age: %v log verbose: %v, log compress: %v, log utc time: %v, load data from: %#v", version.GetAsString(), s.ConfigDir, s.ConfigFile,
+		s.LogMaxSize, s.LogMaxBackups, s.LogMaxAge, s.LogVerbose, s.LogCompress, s.LogUTCTime, s.LoadDataFrom)
 	// in portable mode we don't read configuration from file
 	if s.PortableMode != 1 {
 		err := config.LoadConfig(s.ConfigDir, s.ConfigFile)