diff --git a/pkg/config/config.go b/pkg/config/config.go index e0cd77e03..a8173f1eb 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -39,19 +39,17 @@ type Key string // These constants hold all config value keys const ( // #nosec - ServiceJWTSecret Key = `service.JWTSecret` - ServiceJWTTTL Key = `service.jwtttl` - ServiceJWTTTLLong Key = `service.jwtttllong` - ServiceInterface Key = `service.interface` - ServiceUnixSocket Key = `service.unixsocket` - ServiceUnixSocketMode Key = `service.unixsocketmode` - ServicePublicURL Key = `service.publicurl` - ServiceEnableCaldav Key = `service.enablecaldav` - ServiceRootpath Key = `service.rootpath` - ServiceMaxItemsPerPage Key = `service.maxitemsperpage` - ServiceDemoMode Key = `service.demomode` - // Deprecated: Use metrics.enabled - ServiceEnableMetrics Key = `service.enablemetrics` + ServiceJWTSecret Key = `service.JWTSecret` + ServiceJWTTTL Key = `service.jwtttl` + ServiceJWTTTLLong Key = `service.jwtttllong` + ServiceInterface Key = `service.interface` + ServiceUnixSocket Key = `service.unixsocket` + ServiceUnixSocketMode Key = `service.unixsocketmode` + ServicePublicURL Key = `service.publicurl` + ServiceEnableCaldav Key = `service.enablecaldav` + ServiceRootpath Key = `service.rootpath` + ServiceMaxItemsPerPage Key = `service.maxitemsperpage` + ServiceDemoMode Key = `service.demomode` ServiceMotd Key = `service.motd` ServiceEnableLinkSharing Key = `service.enablelinksharing` ServiceEnableRegistration Key = `service.enableregistration` @@ -326,7 +324,6 @@ func InitDefaultConfig() { ServiceRootpath.setDefault(getBinaryDirLocation()) ServiceMaxItemsPerPage.setDefault(50) - ServiceEnableMetrics.setDefault(false) ServiceMotd.setDefault("") ServiceEnableLinkSharing.setDefault(true) ServiceEnableRegistration.setDefault(true) @@ -595,11 +592,6 @@ func InitConfig() { if DefaultSettingsTimezone.GetString() == "" { DefaultSettingsTimezone.Set(ServiceTimeZone.GetString()) } - - if ServiceEnableMetrics.GetBool() { - log.Warning("service.enablemetrics is deprecated and will be removed in a future release. Please use metrics.enable.") - MetricsEnabled.Set(true) - } } func random(length int) (string, error) { diff --git a/pkg/log/logging.go b/pkg/log/logging.go index e3de9b421..2706f3dbb 100644 --- a/pkg/log/logging.go +++ b/pkg/log/logging.go @@ -71,10 +71,6 @@ func ConfigureLogger(configLogEnabled bool, configLogStandard string, configLogP // The backend is the part which actually handles logging the log entries somewhere. var backend logging.Backend backend = &NoopBackend{} - if configLogStandard == "false" { - configLogStandard = "off" - Warning("log.standard value 'false' is deprecated and will be removed in a future release. Please use the value 'off'.") - } if configLogEnabled && configLogStandard != "off" { logBackend := logging.NewLogBackend(GetLogWriter(configLogStandard, "standard"), "", 0) backend = logging.NewBackendFormatter(logBackend, logging.MustStringFormatter(Fmt+"\n")) diff --git a/pkg/log/watermill_logger.go b/pkg/log/watermill_logger.go index 1d9e3ef69..f3a0c0eb9 100644 --- a/pkg/log/watermill_logger.go +++ b/pkg/log/watermill_logger.go @@ -47,10 +47,6 @@ func NewWatermillLogger(configLogEnabled bool, configLogEvents string, configLog var backend logging.Backend backend = &NoopBackend{} - if configLogEvents == "false" { - configLogEvents = "off" - Warning("log.events value 'false' is deprecated and will be removed in a future release. Please use the value 'off'.") - } if configLogEnabled && configLogEvents != "off" { logBackend := logging.NewLogBackend(GetLogWriter(configLogEvents, "events"), "", 0) backend = logging.NewBackendFormatter(logBackend, logging.MustStringFormatter(watermillFmt+"\n"))