From 1904321a1228c2c77f7835d07682bd188afd59bc Mon Sep 17 00:00:00 2001 From: Piotr Date: Tue, 25 Feb 2025 18:08:13 +0100 Subject: [PATCH] AnalyticsDisabled config value fix --- http/client_handlers.go | 2 +- http/http.go | 12 ++++++------ logdy/logdy.go | 22 +++++++++++----------- main.go | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/http/client_handlers.go b/http/client_handlers.go index 7c13cd6..d5c0f6d 100644 --- a/http/client_handlers.go +++ b/http/client_handlers.go @@ -51,7 +51,7 @@ func handleStatus(config *Config) func(w http.ResponseWriter, r *http.Request) { BaseMessage: models.BaseMessage{ MessageType: models.MessageTypeInit, }, - AnalyticsEnabled: config.AnalyticsEnabled, + AnalyticsEnabled: !config.AnalyticsDisabled, AuthRequired: config.UiPass != "", ConfigStr: configStr, ApiPrefix: config.HttpPathPrefix, diff --git a/http/http.go b/http/http.go index 5a01d0c..487785f 100644 --- a/http/http.go +++ b/http/http.go @@ -130,12 +130,12 @@ func StartWebserver(config *Config) { } type Config struct { - AnalyticsEnabled bool - UiPass string - ConfigFilePath string - BulkWindowMs int64 - HttpPathPrefix string - ApiKey string + AnalyticsDisabled bool + UiPass string + ConfigFilePath string + BulkWindowMs int64 + HttpPathPrefix string + ApiKey string ServerPort string ServerIp string diff --git a/logdy/logdy.go b/logdy/logdy.go index 540eb61..8951a11 100644 --- a/logdy/logdy.go +++ b/logdy/logdy.go @@ -86,17 +86,17 @@ func (l *LogdyInstance) LogString(message string) error { func translateToConfig(c *Config) http.Config { return http.Config{ - AnalyticsEnabled: c.AnalyticsEnabled, - UiPass: c.UiPass, - ConfigFilePath: c.ConfigFilePath, - BulkWindowMs: c.BulkWindowMs, - HttpPathPrefix: c.HttpPathPrefix, - ServerPort: c.ServerPort, - ServerIp: c.ServerIp, - MaxMessageCount: c.MaxMessageCount, - LogLevel: c.LogLevel, - LogInterceptor: c.LogInterceptor, - ApiKey: c.ApiKey, + AnalyticsDisabled: c.AnalyticsEnabled, + UiPass: c.UiPass, + ConfigFilePath: c.ConfigFilePath, + BulkWindowMs: c.BulkWindowMs, + HttpPathPrefix: c.HttpPathPrefix, + ServerPort: c.ServerPort, + ServerIp: c.ServerIp, + MaxMessageCount: c.MaxMessageCount, + LogLevel: c.LogLevel, + LogInterceptor: c.LogInterceptor, + ApiKey: c.ApiKey, } } diff --git a/main.go b/main.go index 06333d9..279720c 100644 --- a/main.go +++ b/main.go @@ -183,7 +183,7 @@ func startWebServer(cmd *cobra.Command) { go utils.CheckUpdatesAndPrintInfo(Version) } - if !config.AnalyticsEnabled { + if !config.AnalyticsDisabled { utils.Logger.Warn("No opt-out from analytics, we'll be receiving anonymous usage data, which will be used to improve the product. To opt-out use the flag --no-analytics.") } @@ -205,7 +205,7 @@ func parseConfig(cmd *cobra.Command) { config.ApiKey, _ = cmd.Flags().GetString("api-key") config.AppendToFileRaw, _ = cmd.Flags().GetBool("append-to-file-raw") config.MaxMessageCount, _ = cmd.Flags().GetInt64("max-message-count") - config.AnalyticsEnabled, _ = cmd.Flags().GetBool("no-analytics") + config.AnalyticsDisabled, _ = cmd.Flags().GetBool("no-analytics") modes.FallthroughGlobal, _ = cmd.Flags().GetBool("fallthrough") modes.DisableANSICodeStripping, _ = cmd.Flags().GetBool("disable-ansi-code-stripping")