Skip to content

Commit

Permalink
fix: server log start, active logger messages were not written to log
Browse files Browse the repository at this point in the history
  • Loading branch information
tucats committed Jan 12, 2025
1 parent 0251bc3 commit 72ec284
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
26 changes: 13 additions & 13 deletions commands/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func RunServer(c *cli.Context) error {
server.StartTime = start.Format(time.UnixDate)

// Make sure the profile contains the minimum required default values.
debugPath, err := setServerDefaults(c)
debugPath, serverToken, err := setServerDefaults(c)
if err != nil {
return err
}
Expand Down Expand Up @@ -82,6 +82,14 @@ func RunServer(c *cli.Context) error {
}
}

ui.Log(ui.ServerLogger, "Starting server (Ego %s), instance %s", c.Version, defs.ServerInstanceID)
ui.Log(ui.ServerLogger, "Active loggers: %s", ui.ActiveLoggers())

// Did we generate a new token? Now's a good time to log this.
if serverToken != "" {
ui.Log(ui.ServerLogger, "New server token generated: %s", serverToken)
}

// If the Info logger is enabled, dump out the settings now. We do not
// include options that contain a token
dumpConfigToLog()
Expand Down Expand Up @@ -212,9 +220,9 @@ func setupServerRouter(err error, debugPath string) (*server.Router, error) {

// setServerDefaults initializes the server-wide settings and global symbol table values
// needed to support starting the REST server.
func setServerDefaults(c *cli.Context) (string, error) {
func setServerDefaults(c *cli.Context) (string, string, error) {
if err := profile.InitProfileDefaults(); err != nil {
return "", err
return "", "", err
}

// The child services need access to the suite of pseudo-global values
Expand Down Expand Up @@ -281,7 +289,7 @@ func setServerDefaults(c *cli.Context) (string, error) {
settings.SetDefault(defs.ServerAuthoritySetting, authServer)

if err := c.Set("users", ""); err != nil {
return "", err
return "", "", err
}
}

Expand Down Expand Up @@ -331,14 +339,6 @@ func setServerDefaults(c *cli.Context) (string, error) {
symbols.RootSymbolTable.SetAlways(defs.DebugServicePathVariable, debugPath)
}

ui.Log(ui.ServerLogger, "Starting server (Ego %s), instance %s", c.Version, defs.ServerInstanceID)
ui.Log(ui.ServerLogger, "Active loggers: %s", ui.ActiveLoggers())

// Did we generate a new token? Now's a good time to log this.
if serverToken != "" {
ui.Log(ui.ServerLogger, "New server token generated: %s", serverToken)
}

// If tracing was requested for the server instance, enable the TRACE logger.
if c.WasFound("trace") {
ui.Active(ui.TraceLogger, true)
Expand All @@ -358,7 +358,7 @@ func setServerDefaults(c *cli.Context) (string, error) {
server.Realm = "Ego Server"
}

return debugPath, nil
return debugPath, serverToken, nil
}

func startSecureServer(c *cli.Context, port int, router *server.Router, addr string) error {
Expand Down
2 changes: 1 addition & 1 deletion tools/buildver.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5-1184
1.5-1185

0 comments on commit 72ec284

Please sign in to comment.