From 8f5268a21c910fb9766eb104fe917d75d435ecf1 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Mon, 30 May 2022 12:43:42 +0100 Subject: [PATCH 1/2] fix: coderd: dev mode should show verbose output by default --- cli/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/server.go b/cli/server.go index 48d7ee237a1ca..cb77cf2400092 100644 --- a/cli/server.go +++ b/cli/server.go @@ -98,7 +98,7 @@ func server() *cobra.Command { Short: "Start a Coder server", RunE: func(cmd *cobra.Command, args []string) error { logger := slog.Make(sloghuman.Sink(os.Stderr)) - if verbose { + if verbose || dev { logger = logger.Leveled(slog.LevelDebug) } From 58ef834571180031544b02be88cbc078ffb1ff67 Mon Sep 17 00:00:00 2001 From: johnstcn Date: Tue, 31 May 2022 09:46:49 +0000 Subject: [PATCH 2/2] check buildinfo for devel prerelease tag --- cli/server.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cli/server.go b/cli/server.go index cb77cf2400092..897653b01914c 100644 --- a/cli/server.go +++ b/cli/server.go @@ -19,6 +19,7 @@ import ( "path/filepath" "time" + "github.com/coder/coder/buildinfo" "github.com/coder/coder/provisioner/echo" "github.com/briandowns/spinner" @@ -29,6 +30,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/spf13/cobra" sdktrace "go.opentelemetry.io/otel/sdk/trace" + "golang.org/x/mod/semver" "golang.org/x/oauth2" xgithub "golang.org/x/oauth2/github" "golang.org/x/xerrors" @@ -98,7 +100,8 @@ func server() *cobra.Command { Short: "Start a Coder server", RunE: func(cmd *cobra.Command, args []string) error { logger := slog.Make(sloghuman.Sink(os.Stderr)) - if verbose || dev { + buildModeDev := semver.Prerelease(buildinfo.Version()) == "-devel" + if verbose || buildModeDev { logger = logger.Leveled(slog.LevelDebug) }