Change variable to include all globals

rest/config.go

@@ -49,8 +49,8 @@ var (
 	// The value of defaultLogFilePath is populated by -defaultLogFilePath by command line flag from service scripts.
 	defaultLogFilePath string
 
-	// serverContextLoggingInitialized is set the first time that logging has been initialized
-	serverContextLoggingInitialized = atomic.Bool{}
+	// serverContextGlobalsInitialized is set the first time that a server context has been initialized
+	serverContextGlobalsInitialized = atomic.Bool{}
 )
 
 const (
@@ -1349,9 +1349,9 @@ func (sc *StartupConfig) Validate(ctx context.Context, isEnterpriseEdition bool)
 // SetupServerContext creates a new ServerContext given its configuration and performs the context validation.
 func SetupServerContext(ctx context.Context, config *StartupConfig, persistentConfig bool) (*ServerContext, error) {
 	// If SetupServerContext is called while any other go routines that might use logging are running, it will
-	// cause a data race, therefore only initialize logging on the first call. From a main program, there is
-	// only one ServerContext.
-	if serverContextLoggingInitialized.CompareAndSwap(false, true) {
+	// cause a data race, therefore only initialize logging and other globals on the first call. From a main
+	// program, there is only one ServerContext.
+	if serverContextGlobalsInitialized.CompareAndSwap(false, true) {
 		// Logging config will now have been loaded from command line
 		// or from a sync_gateway config file so we can validate the
 		// configuration and setup logging now
@@ -1362,17 +1362,17 @@ func SetupServerContext(ctx context.Context, config *StartupConfig, persistentCo
 			log.Printf("[ERR] Error setting up logging: %v", err)
 			return nil, fmt.Errorf("error setting up logging: %v", err)
 		}
+		base.FlushLoggerBuffers()
+
+		if err := setGlobalConfig(ctx, config); err != nil {
+			return nil, err
+		}
 	}
-	base.FlushLoggerBuffers()
 
 	base.InfofCtx(ctx, base.KeyAll, "Logging: Console level: %v", base.ConsoleLogLevel())
 	base.InfofCtx(ctx, base.KeyAll, "Logging: Console keys: %v", base.ConsoleLogKey().EnabledLogKeys())
 	base.InfofCtx(ctx, base.KeyAll, "Logging: Redaction level: %s", config.Logging.RedactionLevel)
 
-	if err := setGlobalConfig(ctx, config); err != nil {
-		return nil, err
-	}
-
 	if err := config.Validate(ctx, base.IsEnterpriseEdition()); err != nil {
 		return nil, err
 	}