From 2c9b7919b316a9c6dbfd5a8d9cf4b7370146593c Mon Sep 17 00:00:00 2001 From: postmannen Date: Fri, 3 Jun 2022 06:02:27 +0200 Subject: [PATCH] renamed flag StartSubREQErrorLog to IsCentralErrorLogger --- configuration_flags.go | 14 +++++++------- processes.go | 2 +- requests_test.go | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configuration_flags.go b/configuration_flags.go index aba2d91..0556c56 100644 --- a/configuration_flags.go +++ b/configuration_flags.go @@ -100,7 +100,7 @@ type Configuration struct { EnableAclUpdates bool // Start the central error logger. - StartSubREQErrorLog bool + IsCentralErrorLogger bool // Subscriber for hello messages StartSubREQHello bool // Subscriber for text logging @@ -177,7 +177,7 @@ type ConfigurationFromFile struct { StartPubREQHello *int EnableKeyUpdates *bool EnableAclUpdates *bool - StartSubREQErrorLog *bool + IsCentralErrorLogger *bool StartSubREQHello *bool StartSubREQToFileAppend *bool StartSubREQToFile *bool @@ -243,7 +243,7 @@ func newConfigurationDefaults() Configuration { StartPubREQHello: 30, EnableKeyUpdates: true, EnableAclUpdates: true, - StartSubREQErrorLog: false, + IsCentralErrorLogger: false, StartSubREQHello: true, StartSubREQToFileAppend: true, StartSubREQToFile: true, @@ -464,10 +464,10 @@ func checkConfigValues(cf ConfigurationFromFile) Configuration { conf.EnableAclUpdates = *cf.EnableAclUpdates } - if cf.StartSubREQErrorLog == nil { - conf.StartSubREQErrorLog = cd.StartSubREQErrorLog + if cf.IsCentralErrorLogger == nil { + conf.IsCentralErrorLogger = cd.IsCentralErrorLogger } else { - conf.StartSubREQErrorLog = *cf.StartSubREQErrorLog + conf.IsCentralErrorLogger = *cf.IsCentralErrorLogger } if cf.StartSubREQHello == nil { conf.StartSubREQHello = cd.StartSubREQHello @@ -620,7 +620,7 @@ func (c *Configuration) CheckFlags() error { flag.BoolVar(&c.EnableAclUpdates, "EnableAclUpdates", fc.EnableAclUpdates, "true/false") - flag.BoolVar(&c.StartSubREQErrorLog, "startSubREQErrorLog", fc.StartSubREQErrorLog, "true/false") + flag.BoolVar(&c.IsCentralErrorLogger, "isCentralErrorLogger", fc.IsCentralErrorLogger, "true/false") flag.BoolVar(&c.StartSubREQHello, "startSubREQHello", fc.StartSubREQHello, "true/false") flag.BoolVar(&c.StartSubREQToFileAppend, "startSubREQToFileAppend", fc.StartSubREQToFileAppend, "true/false") flag.BoolVar(&c.StartSubREQToFile, "startSubREQToFile", fc.StartSubREQToFile, "true/false") diff --git a/processes.go b/processes.go index 6def926..f54bf59 100644 --- a/processes.go +++ b/processes.go @@ -145,7 +145,7 @@ func (p *processes) Start(proc process) { proc.startup.subREQHello(proc) } - if proc.configuration.StartSubREQErrorLog { + if proc.configuration.IsCentralErrorLogger { proc.startup.subREQErrorLog(proc) } diff --git a/requests_test.go b/requests_test.go index 6d767bf..e7efc26 100644 --- a/requests_test.go +++ b/requests_test.go @@ -76,7 +76,7 @@ func newServerForTesting(addressAndPort string, testFolder string) (*server, *Co conf.SocketFolder = testFolder conf.SubscribersDataFolder = testFolder conf.DatabaseFolder = testFolder - conf.StartSubREQErrorLog = true + conf.IsCentralErrorLogger = true conf.IsCentralAuth = true conf.EnableDebug = true