Skip to content

Commit 5ab0de8

Browse files
lunnylunny
committed
Rename the function
1 parent 564c670 commit 5ab0de8

File tree

10 files changed

+30
-30
lines changed

10 files changed

+30
-30
lines changed

‎modules/setting/config_provider.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,9 @@ func deprecatedSetting(rootCfg ConfigProvider, oldSection, oldKey, newSection, n
333333
// make linter happy when there is no deprecated setting at the moment
334334
var _ = deprecatedSetting
335335

336-
func deprecatedSettingWarning(rootCfg ConfigProvider, oldSection, oldKey, newSection, newKey, version string) {
336+
func removedSettingWarning(rootCfg ConfigProvider, oldSection, oldKey, newSection, newKey, version string) {
337337
if rootCfg.Section(oldSection).HasKey(oldKey) {
338-
LogStartupProblem(1, log.ERROR, "Deprecation: config option `[%s].%s` presents, please use `[%s].%s` instead because this fallback has been removed in %s", oldSection, oldKey, newSection, newKey, version)
338+
LogStartupProblem(1, log.ERROR, "Removed: config option `[%s].%s` presents, please use `[%s].%s` instead because this setting has been removed in %s", oldSection, oldKey, newSection, newKey, version)
339339
}
340340
}
341341

‎modules/setting/git.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ func loadGitFrom(rootCfg ConfigProvider) {
9898
GitConfig.SetOption("gc.reflogExpire", "90")
9999

100100
// keep warning here but not read the option
101-
deprecatedSettingWarning(rootCfg, "git.reflog", "ENABLED", "git.config", "core.logAllRefUpdates", "1.21")
102-
deprecatedSettingWarning(rootCfg, "git.reflog", "EXPIRATION", "git.config", "core.reflogExpire", "1.21")
101+
removedSettingWarning(rootCfg, "git.reflog", "ENABLED", "git.config", "core.logAllRefUpdates", "1.21")
102+
removedSettingWarning(rootCfg, "git.reflog", "EXPIRATION", "git.config", "core.reflogExpire", "1.21")
103103

104104
for _, key := range secGitConfig.Keys() {
105105
GitConfig.SetOption(key.Name(), key.String())

‎modules/setting/lfs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func loadLFSFrom(rootCfg ConfigProvider) error {
4242

4343
// DEPRECATED should not be removed because users maybe upgrade from lower version to the latest version
4444
// if these are removed, the warning will not be shown
45-
deprecatedSettingWarning(rootCfg, "server", "LFS_CONTENT_PATH", "lfs", "PATH", "v1.19.0")
45+
removedSettingWarning(rootCfg, "server", "LFS_CONTENT_PATH", "lfs", "PATH", "v1.19.0")
4646

4747
var err error
4848
LFS.Storage, err = getStorage(rootCfg, "lfs", "", lfsSec)

‎modules/setting/log.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,18 @@ func prepareLoggerConfig(rootCfg ConfigProvider) {
6060
sec.Key("logger.default.MODE").MustString(",")
6161
}
6262

63-
deprecatedSettingWarning(rootCfg, "log", "ACCESS", "log", "logger.access.MODE", "1.21")
64-
deprecatedSettingWarning(rootCfg, "log", "ENABLE_ACCESS_LOG", "log", "logger.access.MODE", "1.21")
63+
removedSettingWarning(rootCfg, "log", "ACCESS", "log", "logger.access.MODE", "1.21")
64+
removedSettingWarning(rootCfg, "log", "ENABLE_ACCESS_LOG", "log", "logger.access.MODE", "1.21")
6565

66-
deprecatedSettingWarning(rootCfg, "log", "ROUTER", "log", "logger.router.MODE", "1.21")
67-
deprecatedSettingWarning(rootCfg, "log", "DISABLE_ROUTER_LOG", "log", "logger.router.MODE", "1.21")
66+
removedSettingWarning(rootCfg, "log", "ROUTER", "log", "logger.router.MODE", "1.21")
67+
removedSettingWarning(rootCfg, "log", "DISABLE_ROUTER_LOG", "log", "logger.router.MODE", "1.21")
6868

6969
if !sec.HasKey("logger.router.MODE") {
7070
sec.Key("logger.router.MODE").MustString(",") // use default logger
7171
}
7272

73-
deprecatedSettingWarning(rootCfg, "log", "XORM", "log", "logger.xorm.MODE", "1.21")
74-
deprecatedSettingWarning(rootCfg, "log", "ENABLE_XORM_LOG", "log", "logger.xorm.MODE", "1.21")
73+
removedSettingWarning(rootCfg, "log", "XORM", "log", "logger.xorm.MODE", "1.21")
74+
removedSettingWarning(rootCfg, "log", "ENABLE_XORM_LOG", "log", "logger.xorm.MODE", "1.21")
7575

7676
if !sec.HasKey("logger.xorm.MODE") {
7777
sec.Key("logger.xorm.MODE").MustString(",") // use default logger

‎modules/setting/mailer.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,23 +73,23 @@ func loadMailerFrom(rootCfg ConfigProvider) {
7373
// Handle Deprecations and map on to new configuration
7474
// DEPRECATED should not be removed because users maybe upgrade from lower version to the latest version
7575
// if these are removed, the warning will not be shown
76-
deprecatedSettingWarning(rootCfg, "mailer", "MAILER_TYPE", "mailer", "PROTOCOL", "v1.19.0")
76+
removedSettingWarning(rootCfg, "mailer", "MAILER_TYPE", "mailer", "PROTOCOL", "v1.19.0")
7777

78-
deprecatedSettingWarning(rootCfg, "mailer", "HOST", "mailer", "SMTP_ADDR", "v1.19.0")
78+
removedSettingWarning(rootCfg, "mailer", "HOST", "mailer", "SMTP_ADDR", "v1.19.0")
7979

80-
deprecatedSettingWarning(rootCfg, "mailer", "IS_TLS_ENABLED", "mailer", "PROTOCOL", "v1.19.0")
80+
removedSettingWarning(rootCfg, "mailer", "IS_TLS_ENABLED", "mailer", "PROTOCOL", "v1.19.0")
8181

82-
deprecatedSettingWarning(rootCfg, "mailer", "DISABLE_HELO", "mailer", "ENABLE_HELO", "v1.19.0")
82+
removedSettingWarning(rootCfg, "mailer", "DISABLE_HELO", "mailer", "ENABLE_HELO", "v1.19.0")
8383

84-
deprecatedSettingWarning(rootCfg, "mailer", "SKIP_VERIFY", "mailer", "FORCE_TRUST_SERVER_CERT", "v1.19.0")
84+
removedSettingWarning(rootCfg, "mailer", "SKIP_VERIFY", "mailer", "FORCE_TRUST_SERVER_CERT", "v1.19.0")
8585

86-
deprecatedSettingWarning(rootCfg, "mailer", "USE_CERTIFICATE", "mailer", "USE_CLIENT_CERT", "v1.19.0")
86+
removedSettingWarning(rootCfg, "mailer", "USE_CERTIFICATE", "mailer", "USE_CLIENT_CERT", "v1.19.0")
8787

88-
deprecatedSettingWarning(rootCfg, "mailer", "CERT_FILE", "mailer", "CLIENT_CERT_FILE", "v1.19.0")
88+
removedSettingWarning(rootCfg, "mailer", "CERT_FILE", "mailer", "CLIENT_CERT_FILE", "v1.19.0")
8989

90-
deprecatedSettingWarning(rootCfg, "mailer", "KEY_FILE", "mailer", "CLIENT_KEY_FILE", "v1.19.0")
90+
removedSettingWarning(rootCfg, "mailer", "KEY_FILE", "mailer", "CLIENT_KEY_FILE", "v1.19.0")
9191

92-
deprecatedSettingWarning(rootCfg, "mailer", "ENABLE_HTML_ALTERNATIVE", "mailer", "SEND_AS_PLAIN_TEXT", "v1.19.0")
92+
removedSettingWarning(rootCfg, "mailer", "ENABLE_HTML_ALTERNATIVE", "mailer", "SEND_AS_PLAIN_TEXT", "v1.19.0")
9393

9494
if sec.HasKey("PROTOCOL") && sec.Key("PROTOCOL").String() == "smtp+startls" {
9595
log.Error("Deprecated fallback `[mailer]` `PROTOCOL = smtp+startls` present. Use `[mailer]` `PROTOCOL = smtp+starttls`` instead. This fallback will be removed in v1.19.0")

‎modules/setting/mirror.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var Mirror = struct {
2727
func loadMirrorFrom(rootCfg ConfigProvider) {
2828
// DEPRECATED should not be removed because users maybe upgrade from lower version to the latest version
2929
// if these are removed, the warning will not be shown
30-
deprecatedSettingWarning(rootCfg, "repository", "DISABLE_MIRRORS", "mirror", "ENABLED", "v1.19.0")
30+
removedSettingWarning(rootCfg, "repository", "DISABLE_MIRRORS", "mirror", "ENABLED", "v1.19.0")
3131

3232
if err := rootCfg.Section("mirror").MapTo(&Mirror); err != nil {
3333
log.Fatal("Failed to map Mirror settings: %v", err)

‎modules/setting/oauth2.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func loadOAuth2From(rootCfg ConfigProvider) {
121121
}
122122

123123
// Handle the rename of ENABLE to ENABLED
124-
deprecatedSettingWarning(rootCfg, "oauth2", "ENABLE", "oauth2", "ENABLED", "v1.23.0")
124+
removedSettingWarning(rootCfg, "oauth2", "ENABLE", "oauth2", "ENABLED", "v1.23.0")
125125

126126
if !filepath.IsAbs(OAuth2.JWTSigningPrivateKeyFile) {
127127
OAuth2.JWTSigningPrivateKeyFile = filepath.Join(AppDataPath, OAuth2.JWTSigningPrivateKeyFile)

‎modules/setting/server.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func loadServerFrom(rootCfg ConfigProvider) {
174174
if sec.HasKey("ENABLE_ACME") {
175175
EnableAcme = sec.Key("ENABLE_ACME").MustBool(false)
176176
} else {
177-
deprecatedSettingWarning(rootCfg, "server", "ENABLE_LETSENCRYPT", "server", "ENABLE_ACME", "v1.19.0")
177+
removedSettingWarning(rootCfg, "server", "ENABLE_LETSENCRYPT", "server", "ENABLE_ACME", "v1.19.0")
178178
}
179179

180180
Protocol = HTTP
@@ -193,7 +193,7 @@ func loadServerFrom(rootCfg ConfigProvider) {
193193
if sec.HasKey("ACME_ACCEPTTOS") {
194194
AcmeTOS = sec.Key("ACME_ACCEPTTOS").MustBool(false)
195195
} else {
196-
deprecatedSettingWarning(rootCfg, "server", "LETSENCRYPT_ACCEPTTOS", "server", "ACME_ACCEPTTOS", "v1.19.0")
196+
removedSettingWarning(rootCfg, "server", "LETSENCRYPT_ACCEPTTOS", "server", "ACME_ACCEPTTOS", "v1.19.0")
197197
}
198198
if !AcmeTOS {
199199
log.Fatal("ACME TOS is not accepted (ACME_ACCEPTTOS).")
@@ -202,13 +202,13 @@ func loadServerFrom(rootCfg ConfigProvider) {
202202
if sec.HasKey("ACME_DIRECTORY") {
203203
AcmeLiveDirectory = sec.Key("ACME_DIRECTORY").MustString("https")
204204
} else {
205-
deprecatedSettingWarning(rootCfg, "server", "LETSENCRYPT_DIRECTORY", "server", "ACME_DIRECTORY", "v1.19.0")
205+
removedSettingWarning(rootCfg, "server", "LETSENCRYPT_DIRECTORY", "server", "ACME_DIRECTORY", "v1.19.0")
206206
}
207207

208208
if sec.HasKey("ACME_EMAIL") {
209209
AcmeEmail = sec.Key("ACME_EMAIL").MustString("")
210210
} else {
211-
deprecatedSettingWarning(rootCfg, "server", "LETSENCRYPT_EMAIL", "server", "ACME_EMAIL", "v1.19.0")
211+
removedSettingWarning(rootCfg, "server", "LETSENCRYPT_EMAIL", "server", "ACME_EMAIL", "v1.19.0")
212212
}
213213
if AcmeEmail == "" {
214214
log.Fatal("ACME Email is not set (ACME_EMAIL).")

‎modules/setting/service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func loadServiceFrom(rootCfg ConfigProvider) {
153153
Service.RegisterManualConfirm = false
154154
}
155155

156-
deprecatedSettingWarning(rootCfg, "service", "EMAIL_DOMAIN_WHITELIST", "service", "EMAIL_DOMAIN_ALLOWLIST", "1.21")
156+
removedSettingWarning(rootCfg, "service", "EMAIL_DOMAIN_WHITELIST", "service", "EMAIL_DOMAIN_ALLOWLIST", "1.21")
157157

158158
Service.EmailDomainAllowList = CompileEmailGlobList(sec, "EMAIL_DOMAIN_WHITELIST", "EMAIL_DOMAIN_ALLOWLIST")
159159
Service.EmailDomainBlockList = CompileEmailGlobList(sec, "EMAIL_DOMAIN_BLOCKLIST")

‎modules/setting/task.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ func loadTaskFrom(rootCfg ConfigProvider) {
1010
taskSec := rootCfg.Section("task")
1111
queueTaskSec := rootCfg.Section("queue.task")
1212

13-
deprecatedSettingWarning(rootCfg, "task", "QUEUE_TYPE", "queue.task", "TYPE", "v1.19.0")
14-
deprecatedSettingWarning(rootCfg, "task", "QUEUE_CONN_STR", "queue.task", "CONN_STR", "v1.19.0")
15-
deprecatedSettingWarning(rootCfg, "task", "QUEUE_LENGTH", "queue.task", "LENGTH", "v1.19.0")
13+
removedSettingWarning(rootCfg, "task", "QUEUE_TYPE", "queue.task", "TYPE", "v1.19.0")
14+
removedSettingWarning(rootCfg, "task", "QUEUE_CONN_STR", "queue.task", "CONN_STR", "v1.19.0")
15+
removedSettingWarning(rootCfg, "task", "QUEUE_LENGTH", "queue.task", "LENGTH", "v1.19.0")
1616

1717
switch taskSec.Key("QUEUE_TYPE").MustString("channel") {
1818
case "channel":

0 commit comments

Comments
 (0)