Skip to content

Commit

Permalink
Merge pull request #1613 from memphisdev/bugfix-RND-449-strange-issue…
Browse files Browse the repository at this point in the history
…-with-config-file-with-user-password

bugfix-RND-449-strange-issue-with-config-file-with-user-password
  • Loading branch information
shohamroditimemphis authored Jan 8, 2024
2 parents 0025e92 + 545d3ec commit dcca037
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,14 +201,6 @@ func main() {
if err != nil {
server.PrintAndDie(fmt.Sprintf("%s: %s", exe, err))
}

// we do this check here and not below the function creating the users - CreateUsersFromConfigOnFirstSystemLoad because we need the s *Server for logs
if errCreateUsers != nil {
s.Warnf("[tenant: %v]Failed create users from config file", s.MemphisGlobalAccountString(), errCreateUsers.Error())
}
if lenUsers > 0 {
s.Noticef("[tenant: %v]loaded %d users from config file", s.MemphisGlobalAccountString(), lenUsers)
}
// Configure the logger based on the flags
s.ConfigureLogger()

Expand All @@ -217,6 +209,14 @@ func main() {
server.PrintAndDie(err.Error())
}

// we do this check here and not below the function creating the users - CreateUsersFromConfigOnFirstSystemLoad because we need the s *Server for logs
if errCreateUsers != nil {
s.Warnf("[tenant: %v]Failed create users from config file %v", s.MemphisGlobalAccountString(), errCreateUsers.Error())
}
if lenUsers > 0 {
s.Noticef("[tenant: %v]loaded %d users from config file", s.MemphisGlobalAccountString(), lenUsers)
}

// Adjust MAXPROCS if running under linux/cgroups quotas.
undo, err := maxprocs.Set(maxprocs.Logger(s.Debugf))
if err != nil {
Expand Down

0 comments on commit dcca037

Please sign in to comment.