aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcassio zareck <121526696+cassiozareck@users.noreply.github.com>2024-12-30 02:54:20 -0300
committerGitHub <noreply@github.com>2024-12-30 05:54:20 +0000
commit1e2c8eb494ff5b8378653db5fed876d824ebca6f (patch)
tree9fdbdbeebad8f65c0e81697ac0de992afcfad348
parentdafadf0028e163ed6ad050ba54f12525a161fa2b (diff)
downloadgitea-1e2c8eb494ff5b8378653db5fed876d824ebca6f.tar.gz
gitea-1e2c8eb494ff5b8378653db5fed876d824ebca6f.zip
Fix settings not being loaded at CLI (#26402)
Closes #25898 The problem was that the default settings weren't being loaded --------- Signed-off-by: cassiozareck <cassiomilczareck@gmail.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
-rw-r--r--cmd/admin_user_create.go4
-rw-r--r--cmd/web.go11
-rw-r--r--modules/setting/cors.go5
-rw-r--r--modules/setting/indexer.go2
-rw-r--r--modules/setting/mailer.go4
-rw-r--r--modules/setting/session.go2
-rw-r--r--modules/setting/time.go1
7 files changed, 16 insertions, 13 deletions
diff --git a/cmd/admin_user_create.go b/cmd/admin_user_create.go
index 106d14b25a..bf8cbc7c4c 100644
--- a/cmd/admin_user_create.go
+++ b/cmd/admin_user_create.go
@@ -69,6 +69,10 @@ var microcmdUserCreate = &cli.Command{
}
func runCreateUser(c *cli.Context) error {
+ // this command highly depends on the many setting options (create org, visibility, etc.), so it must have a full setting load first
+ // duplicate setting loading should be safe at the moment, but it should be refactored & improved in the future.
+ setting.LoadSettings()
+
if err := argsSet(c, "email"); err != nil {
return err
}
diff --git a/cmd/web.go b/cmd/web.go
index ef8a7426c1..f8217758e5 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -12,6 +12,7 @@ import (
"path/filepath"
"strconv"
"strings"
+ "time"
_ "net/http/pprof" // Used for debugging if enabled and a web server is running
@@ -115,6 +116,16 @@ func showWebStartupMessage(msg string) {
log.Info("* CustomPath: %s", setting.CustomPath)
log.Info("* ConfigFile: %s", setting.CustomConf)
log.Info("%s", msg) // show startup message
+
+ if setting.CORSConfig.Enabled {
+ log.Info("CORS Service Enabled")
+ }
+ if setting.DefaultUILocation != time.Local {
+ log.Info("Default UI Location is %v", setting.DefaultUILocation.String())
+ }
+ if setting.MailService != nil {
+ log.Info("Mail Service Enabled: RegisterEmailConfirm=%v, Service.EnableNotifyMail=%v", setting.Service.RegisterEmailConfirm, setting.Service.EnableNotifyMail)
+ }
}
func serveInstall(ctx *cli.Context) error {
diff --git a/modules/setting/cors.go b/modules/setting/cors.go
index 63daaad60b..5260887d9d 100644
--- a/modules/setting/cors.go
+++ b/modules/setting/cors.go
@@ -5,8 +5,6 @@ package setting
import (
"time"
-
- "code.gitea.io/gitea/modules/log"
)
// CORSConfig defines CORS settings
@@ -28,7 +26,4 @@ var CORSConfig = struct {
func loadCorsFrom(rootCfg ConfigProvider) {
mustMapSetting(rootCfg, "cors", &CORSConfig)
- if CORSConfig.Enabled {
- log.Info("CORS Service Enabled")
- }
}
diff --git a/modules/setting/indexer.go b/modules/setting/indexer.go
index 18585602c3..34b4eac15b 100644
--- a/modules/setting/indexer.go
+++ b/modules/setting/indexer.go
@@ -97,7 +97,7 @@ func IndexerGlobFromString(globstr string) []*GlobMatcher {
expr = strings.TrimSpace(expr)
if expr != "" {
if g, err := GlobMatcherCompile(expr, '.', '/'); err != nil {
- log.Info("Invalid glob expression '%s' (skipped): %v", expr, err)
+ log.Warn("Invalid glob expression '%s' (skipped): %v", expr, err)
} else {
extarr = append(extarr, g)
}
diff --git a/modules/setting/mailer.go b/modules/setting/mailer.go
index d4db55dc7b..4c3dff6850 100644
--- a/modules/setting/mailer.go
+++ b/modules/setting/mailer.go
@@ -255,8 +255,6 @@ func loadMailerFrom(rootCfg ConfigProvider) {
MailService.OverrideEnvelopeFrom = true
MailService.EnvelopeFrom = parsed.Address
}
-
- log.Info("Mail Service Enabled")
}
func loadRegisterMailFrom(rootCfg ConfigProvider) {
@@ -267,7 +265,6 @@ func loadRegisterMailFrom(rootCfg ConfigProvider) {
return
}
Service.RegisterEmailConfirm = true
- log.Info("Register Mail Service Enabled")
}
func loadNotifyMailFrom(rootCfg ConfigProvider) {
@@ -278,7 +275,6 @@ func loadNotifyMailFrom(rootCfg ConfigProvider) {
return
}
Service.EnableNotifyMail = true
- log.Info("Notify Mail Service Enabled")
}
func tryResolveAddr(addr string) []net.IPAddr {
diff --git a/modules/setting/session.go b/modules/setting/session.go
index afe63bfdb7..19a05ce2c2 100644
--- a/modules/setting/session.go
+++ b/modules/setting/session.go
@@ -73,6 +73,4 @@ func loadSessionFrom(rootCfg ConfigProvider) {
SessionConfig.ProviderConfig = string(shadowConfig)
SessionConfig.OriginalProvider = SessionConfig.Provider
SessionConfig.Provider = "VirtualSession"
-
- log.Info("Session Service Enabled")
}
diff --git a/modules/setting/time.go b/modules/setting/time.go
index 39acba12ef..97988211a9 100644
--- a/modules/setting/time.go
+++ b/modules/setting/time.go
@@ -20,7 +20,6 @@ func loadTimeFrom(rootCfg ConfigProvider) {
if err != nil {
log.Fatal("Load time zone failed: %v", err)
}
- log.Info("Default UI Location is %v", zone)
}
if DefaultUILocation == nil {
DefaultUILocation = time.Local