Skip to content
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

Jump to bottom

bugfix-RND-449-strange-issue-with-config-file-with-user-password #1613

Merged
merged 2 commits into from
Jan 8, 2024
Merged

bugfix-RND-449-strange-issue-with-config-file-with-user-password #1613

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4001ec5
move the logs after server
shohamroditimemphis Jan 7, 2024
545d3ec
fix log
shohamroditimemphis Jan 7, 2024
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
16 changes: 8 additions & 8 deletions main.go
View file
Open in desktop
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