Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions core/commoncmd/daemon_log.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ func NewCmdDaemonLog() *cobra.Command {
flags := cmd.Flags()
FlagNodeSelector(flags, &options.NodeSelector)
FlagDaemonLogLevel(flags, &options.Level)
_ = cmd.MarkFlagRequired("level")

return cmd
}

Expand Down
2 changes: 1 addition & 1 deletion core/commoncmd/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func FlagDaemonListenerName(flags *pflag.FlagSet, p *string) {
}

func FlagDaemonLogLevel(flags *pflag.FlagSet, p *string) {
flags.StringVar(p, "level", "", "trace, debug, info, warn, error, fatal, panic")
flags.StringVar(p, "level", "", "trace, debug, info, warn, error, fatal, panic, none")
}

func FlagDepth(flags *pflag.FlagSet, p *int) {
Expand Down
9 changes: 7 additions & 2 deletions daemon/daemonapi/post_daemon_log_control.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,13 @@ func (a *DaemonAPI) PostDaemonLogControl(ctx echo.Context, nodename string) erro

func (a *DaemonAPI) postLocalDaemonLogControl(ctx echo.Context, payload api.LogControl) error {
var level string
if payload.Level != "none" {
level = string(payload.Level)
switch payload.Level {
case "":
return JSONProblemf(ctx, http.StatusBadRequest, "Invalid body", "missing 'level' field")
case "none":
// NoLevel
default:
level = payload.Level
}
newLevel, err := zerolog.ParseLevel(level)
if err != nil {
Expand Down