diff options
| author | Lunny Xiao | 2023-02-24 18:23:13 +0800 |
|---|---|---|
| committer | GitHub | 2023-02-24 18:23:13 +0800 |
| commit | 91fa0eb9d7b8c1bb5afac9d68161cf95ae0a02f8 (patch) | |
| tree | e2e552ec7ec356af752411d8b595e81c1d28ed24 /modules | |
| parent | edf98a2dc30956c8e04b778bb7f1ce55c14ba963 (diff) | |
Avoid warning for system setting when start up (#23054)
Partially fix #23050
After #22294 merged, it always has a warning log like `cannot get
context cache` when starting up. This should not affect any real life
but it's annoying. This PR will fix the problem. That means when
starting up, getting the system settings will not try from the cache but
will read from the database directly.
---------
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/repository/commits_test.go | 2 | ||||
| -rw-r--r-- | modules/templates/helper.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/repository/commits_test.go b/modules/repository/commits_test.go index 2bd8de38a..a407083f3 100644 --- a/modules/repository/commits_test.go +++ b/modules/repository/commits_test.go @@ -106,7 +106,7 @@ func enableGravatar(t *testing.T) { err := system_model.SetSettingNoVersion(db.DefaultContext, system_model.KeyPictureDisableGravatar, "false") assert.NoError(t, err) setting.GravatarSource = "https://secure.gravatar.com/avatar" - err = system_model.Init() + err = system_model.Init(db.DefaultContext) assert.NoError(t, err) } diff --git a/modules/templates/helper.go b/modules/templates/helper.go index b7bd07670..17ac68dc6 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -92,7 +92,7 @@ func NewFuncMap() []template.FuncMap { return setting.AssetVersion }, "DisableGravatar": func(ctx context.Context) bool { - return system_model.GetSettingBool(ctx, system_model.KeyPictureDisableGravatar) + return system_model.GetSettingWithCacheBool(ctx, system_model.KeyPictureDisableGravatar) }, "DefaultShowFullName": func() bool { return setting.UI.DefaultShowFullName |