public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add setting for how to long we should keep expired tokens

Browse Source
This commit is contained in:
bergquist
2019-01-22 15:31:43 +01:00
parent d3ec8e1ccb
commit 64124b5042
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/setting/setting.go
+9 -7
View File
@@ -224,10 +224,11 @@ type Cfg struct {
EnableAlphaPanels bool
EnterpriseLicensePath string
LoginCookieName string
LoginCookieUsername string
LoginCookieSecure bool
LoginCookieMaxDays int
LoginCookieName string
LoginCookieUsername string
LoginCookieSecure bool
LoginCookieMaxDays int
LoginDeleteExpiredTokensAfterDays int
}
type CommandLineArgs struct {
@@ -553,10 +554,11 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
//login
login := iniFile.Section("login")
cfg.LoginCookieName = login.Key("cookie_name").String()
cfg.LoginCookieMaxDays = login.Key("login_remember_days").MustInt()
cfg.LoginCookieName = login.Key("cookie_name").MustString("grafana_session")
cfg.LoginCookieMaxDays = login.Key("login_remember_days").MustInt(7)
cfg.LoginCookieSecure = login.Key("cookie_secure").MustBool(false)
cfg.LoginCookieUsername = login.Key("cookie_username").String()
cfg.LoginCookieUsername = login.Key("cookie_username").MustString("grafana_username")
cfg.LoginDeleteExpiredTokensAfterDays = login.Key("delete_expired_token_after_days").MustInt(30)
Env = iniFile.Section("").Key("app_mode").MustString("development")
InstanceName = iniFile.Section("").Key("instance_name").MustString("unknown_instance_name")