tweaks for logging directory path

Author: gregns1

rest/main.go

@@ -53,18 +53,12 @@ func serverMain(ctx context.Context, osArgs []string) error {
 		}
 		return err
 	}
-	if runtime.GOOS != "windows" {
-		// stop signal handlers and register for stack trace handling, this is not supported for windows environments
-		signal.Stop(sigChan)
-		close(sigChan)
-		RegisterSignalHandler(ctx, flagStartupConfig.Logging.LogFilePath)
-	}
 
 	if *disablePersistentConfig {
 		return legacyServerMain(ctx, osArgs, flagStartupConfig)
 	}
 
-	disablePersistentConfigFallback, err := serverMainPersistentConfig(ctx, fs, flagStartupConfig)
+	disablePersistentConfigFallback, err := serverMainPersistentConfig(ctx, fs, flagStartupConfig, sigChan)
 	if disablePersistentConfigFallback {
 		return legacyServerMain(ctx, osArgs, flagStartupConfig)
 	}
@@ -73,7 +67,7 @@ func serverMain(ctx context.Context, osArgs []string) error {
 }
 
 // serverMainPersistentConfig runs the Sync Gateway server with persistent config.
-func serverMainPersistentConfig(ctx context.Context, fs *flag.FlagSet, flagStartupConfig *StartupConfig) (disablePersistentConfigFallback bool, err error) {
+func serverMainPersistentConfig(ctx context.Context, fs *flag.FlagSet, flagStartupConfig *StartupConfig, sigChan chan os.Signal) (disablePersistentConfigFallback bool, err error) {
 
 	sc := DefaultStartupConfig(defaultLogFilePath)
 	base.TracefCtx(ctx, base.KeyAll, "default config: %#v", sc)
@@ -156,6 +150,14 @@ func serverMainPersistentConfig(ctx context.Context, fs *flag.FlagSet, flagStart
 		return false, err
 	}
 
+	if runtime.GOOS != "windows" {
+		// stop signal handlers and register for stack trace handling to be able to log to configured directory,
+		// this is not supported for windows environments
+		signal.Stop(sigChan)
+		close(sigChan)
+		RegisterSignalHandler(ctx, svrctx.Config.Logging.LogFilePath)
+	}
+
 	svrctx.initialStartupConfig = initialStartupConfig
 
 	svrctx.addLegacyPrincipals(ctx, legacyDbUsers, legacyDbRoles)