Skip to content

fix(enterprise/cli): add CODER_PROVISIONER_DAEMON_LOG_* options #11279

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
merged 9 commits into from
Dec 19, 2023
Merged

fix(enterprise/cli): add CODER_PROVISIONER_DAEMON_LOG_* options #11279

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1377d01
refactor(coder/cli): extract BuildLogger to clilog
johnstcn Dec 19, 2023
1963c14
move to functional options
johnstcn Dec 19, 2023
15e5e1c
refactor(cli): use clilog instead of BuildLogger
johnstcn Dec 19, 2023
e83c1c0
fix(enterprise/cli): plumb through CODER_PROVISIONERD_LOG_* options
johnstcn Dec 19, 2023
8249612
address linter complaints
johnstcn Dec 19, 2023
5120a27
make fmt
johnstcn Dec 19, 2023
69e13ed
make gen
johnstcn Dec 19, 2023
98b2758
address PR comments
johnstcn Dec 19, 2023
f2642d0
fixup! address PR comments
johnstcn Dec 19, 2023
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
Prev Previous commit
Next Next commit
address linter complaints
  • Loading branch information
@johnstcn
johnstcn committed Dec 19, 2023
commit 8249612028fe4c74b939319efee63e3c0b0d6409
2 changes: 1 addition & 1 deletion cli/clilog/clilog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ func WithTrace() Option {
return func(b *Builder) {
b.Trace = true
}

}

func WithVerbose() Option {
return func(b *Builder) {
b.Verbose = true
Expand Down
6 changes: 6 additions & 0 deletions enterprise/cli/provisionerdaemons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"golang.org/x/xerrors"

"cdr.dev/slog"
"cdr.dev/slog/sloggers/sloghuman"
agpl "github.com/coder/coder/v2/cli"
"github.com/coder/coder/v2/cli/clibase"
"github.com/coder/coder/v2/cli/clilog"
Expand Down Expand Up @@ -105,6 +106,11 @@ func (r *RootCmd) provisionerDaemonStart() *clibase.Cmd {
}

logger, closeLogger, err := clilog.New(logOpts...).Build(inv)
if err != nil {
// Fall back to a basic logger
logger = slog.Make(sloghuman.Sink(inv.Stderr))
logger.Error(ctx, "failed to initialize logger", slog.Error(err))
}
defer closeLogger()

if len(tags) != 0 {
Expand Down