Skip to content

chore(log-levels): Refactor log level env flag #46

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

Merged
zacharyblasczyk merged 1 commit into from
Jan 29, 2026
Merged

chore(log-levels): Refactor log level env flag #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions cmd/ctrlc/ctrlc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ func init() {
viper.BindPFlag("workspace", cmd.PersistentFlags().Lookup("workspace"))
viper.BindEnv("workspace", "CTRLPLANE_WORKSPACE")

viper.BindPFlag("log-level", cmd.PersistentFlags().Lookup("log-level"))
viper.BindEnv("log-level", "CTRLPLANE_LOG_LEVEL")

viper.BindEnv("cluster-identifier", "CTRLPLANE_CLUSTER_IDENTIFIER")
}

Expand Down
22 changes: 7 additions & 15 deletions cmd/ctrlc/root/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package root

import (
"os"

"github.com/MakeNowJust/heredoc/v2"

"github.com/charmbracelet/log"
Expand All @@ -14,6 +12,7 @@ import (
"github.com/ctrlplanedev/cli/cmd/ctrlc/root/sync"
"github.com/ctrlplanedev/cli/cmd/ctrlc/root/version"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)

func NewRootCmd() *cobra.Command {
Expand All @@ -28,7 +27,11 @@ func NewRootCmd() *cobra.Command {
$ ctrlc connect <agent-name>
`),
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
switch logLevel {
level := viper.GetString("log-level")
if level == "" {
level = logLevel
}
switch level {
case "debug":
log.SetLevel(log.DebugLevel)
case "info":
Expand All @@ -45,7 +48,7 @@ func NewRootCmd() *cobra.Command {
},
}

cmd.PersistentFlags().StringVar(&logLevel, "log-level", defaultOrEnv("info", "CTRLC_LOG_LEVEL"), "Set the logging level (debug, info, warn, error)")
cmd.PersistentFlags().StringVar(&logLevel, "log-level", "info", "Set the logging level (debug, info, warn, error)")

cmd.AddCommand(agent.NewAgentCmd())
cmd.AddCommand(api.NewAPICmd())
Expand All @@ -58,14 +61,3 @@ func NewRootCmd() *cobra.Command {

return cmd
}

func defaultOrEnv(defaultValue string, envVarName string) string {
if envVarName == "" {
return defaultValue
}
value, set := os.LookupEnv(envVarName)
if !set {
value = defaultValue
}
return value
}