Skip to content

Agent Mesh

cmd: make LOG_FORMAT=json take effect

Tomas Tormo1046895c83ba
diff --git a/cmd/agentmesh-control-plane/main.go b/cmd/agentmesh-control-plane/main.go
index de90171e..dd3731ab 100644
--- a/cmd/agentmesh-control-plane/main.go
+++ b/cmd/agentmesh-control-plane/main.go
@@ -79,8 +79,11 @@ func main() {
},
Run: func(cmd *cobra.Command, args []string) {
// Initialize logging
+ // go-log read GOLOG_LOG_FMT at package init, before a Setenv here could land.
if os.Getenv("LOG_FORMAT") == "json" {
- _ = os.Setenv("GOLOG_LOG_FMT", "json")
+ cfg := golog.GetConfig()
+ cfg.Format = golog.JSONOutput
+ golog.SetupLogging(cfg)
}
golog.SetAllLoggers(golog.LevelInfo)
if logLevel != "" {
diff --git a/cmd/agentmesh-one/main.go b/cmd/agentmesh-one/main.go
index d74ca8e5..09f8e18e 100644
--- a/cmd/agentmesh-one/main.go
+++ b/cmd/agentmesh-one/main.go
@@ -74,8 +74,11 @@ func main() {
Short: "Agent Mesh - all-in-one standalone server",
Version: version.String(),
Run: func(cmd *cobra.Command, args []string) {
+ // go-log read GOLOG_LOG_FMT at package init, before a Setenv here could land.
if os.Getenv("LOG_FORMAT") == "json" {
- _ = os.Setenv("GOLOG_LOG_FMT", "json")
+ cfg := golog.GetConfig()
+ cfg.Format = golog.JSONOutput
+ golog.SetupLogging(cfg)
}
lvl := golog.LevelInfo
if logLevel != "" {
diff --git a/cmd/agentmesh-router/main.go b/cmd/agentmesh-router/main.go
index a1dec84b..aa597af3 100644
--- a/cmd/agentmesh-router/main.go
+++ b/cmd/agentmesh-router/main.go
@@ -69,8 +69,11 @@ func main() {
Version: version.String(),
Run: func(cmd *cobra.Command, args []string) {
// Initialize logging
+ // go-log read GOLOG_LOG_FMT at package init, before a Setenv here could land.
if os.Getenv("LOG_FORMAT") == "json" {
- _ = os.Setenv("GOLOG_LOG_FMT", "json")
+ cfg := golog.GetConfig()
+ cfg.Format = golog.JSONOutput
+ golog.SetupLogging(cfg)
}
golog.SetAllLoggers(golog.LevelInfo)
if logLevel != "" {