Skip to content

Fix set system setting failure once it cached #22333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 8, 2023
Merged

Fix set system setting failure once it cached #22333

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fec358b
Fix bug
lunny Jan 4, 2023
a8bf87b
Fix bug
lunny Jan 4, 2023
fa0dab0
improve test
lunny Jan 4, 2023
84ecceb
fix lint
lunny Jan 4, 2023
1ffb09a
Merge branch 'main' into lunny/fix_set_system_settting
lunny Jan 6, 2023
58e6746
Fix bug
lunny Jan 6, 2023
2d398d3
Merge branch 'main' into lunny/fix_set_system_settting
lunny Jan 6, 2023
d7c0a0f
Merge branch 'main' into lunny/fix_set_system_settting
lunny Jan 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions models/system/setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,8 @@ func SetSettingNoVersion(key, value string) error {

// SetSetting updates a users' setting for a specific key
func SetSetting(setting *Setting) error {
_, err := cache.GetString(genSettingCacheKey(setting.SettingKey), func() (string, error) {
return setting.SettingValue, upsertSettingValue(strings.ToLower(setting.SettingKey), setting.SettingValue, setting.Version)
})
if err != nil {
return err
}

setting.Version++
return nil
cache.Remove(genSettingCacheKey(setting.SettingKey))
return upsertSettingValue(strings.ToLower(setting.SettingKey), setting.SettingValue, setting.Version)
}

func upsertSettingValue(key, value string, version int) error {
Expand Down
5 changes: 5 additions & 0 deletions models/system/setting_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ func TestSettings(t *testing.T) {
err = system.SetSetting(updatedSetting)
assert.NoError(t, err)

// make sure it's not cached
updatedSetting = &system.Setting{SettingKey: keyName, SettingValue: "100", Version: newSetting.Version}
err = system.SetSetting(updatedSetting)
assert.NoError(t, err)

// get all settings
settings, err = system.GetAllSettings()
assert.NoError(t, err)
Expand Down