Kiu/VictoriaMetrics
Kiu/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-23 20:37:12 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

app/vmauth: remove duplicate mentioning of -auth.config value in error message in logs on usuccessful load of -auth.config

Browse Source 
This is a follow-up for 25759082f4
This commit is contained in:
Aliaksandr Valialkin 2023-05-08 10:04:25 -07:00
parent 1b288e0a05
commit 09268d41ed
No known key found for this signature in database
GPG Key ID: A72BEC6CD3D0DED1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/vmauth/auth_config.go
View File

@ -293,7 +293,7 @@ func initAuthConfig() {
err := loadAuthConfig() err := loadAuthConfig()
if err != nil { if err != nil {
logger.Fatalf("cannot load auth config from `-auth.config=%s`: %s", *authConfigPath, err) logger.Fatalf("cannot load auth config: %s", err)
} }
stopCh = make(chan struct{}) stopCh = make(chan struct{})
@ -328,10 +328,9 @@ func authConfigReloader(sighupCh <-chan os.Signal) {
logger.Infof("SIGHUP received; loading -auth.config=%q", *authConfigPath) logger.Infof("SIGHUP received; loading -auth.config=%q", *authConfigPath)
err := loadAuthConfig() err := loadAuthConfig()
if err != nil { if err != nil {
logger.Errorf("failed to load -auth.config=%q; using the last successfully loaded config; error: %s", *authConfigPath, err) logger.Errorf("failed to load auth config; using the last successfully loaded config; error: %s", err)
continue continue
} }
logger.Infof("Successfully reloaded -auth.config=%q", *authConfigPath)
} }
} }
} }
@ -344,14 +343,14 @@ var stopCh chan struct{}
func loadAuthConfig() error { func loadAuthConfig() error {
ac, err := readAuthConfig(*authConfigPath) ac, err := readAuthConfig(*authConfigPath)
if err != nil { if err != nil {
return fmt.Errorf("failed to load `-auth.config=%q`: %s", *authConfigPath, err) return fmt.Errorf("failed to load -auth.config=%q: %s", *authConfigPath, err)
} }
m, err := parseAuthConfigUsers(ac) m, err := parseAuthConfigUsers(ac)
if err != nil { if err != nil {
return fmt.Errorf("failed to parse users from `-auth.config=%q`: %s", *authConfigPath, err) return fmt.Errorf("failed to parse users from -auth.config=%q: %s", *authConfigPath, err)
} }
logger.Infof("Loaded information about %d users from %q", len(m), *authConfigPath) logger.Infof("loaded information about %d users from -auth.config=%q", len(m), *authConfigPath)
authConfig.Store(ac) authConfig.Store(ac)
authUsers.Store(&m) authUsers.Store(&m)