Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit26a725f

Browse files
authored
fix: provisionerd: add more context to logs emitted, fix log level (#6508)
- Previously, we were logging all provision response logs at level INFO, regardless of the log level of the log streamed from the provisioner. We now log these at the original level (defaulting to INFO).- Now logging "provision failed" message at level ERROR WARN and including the error field in the message.
1 parent8900812 commit26a725f

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

‎provisionerd/runner/runner.go

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ func (r *Runner) buildWorkspace(ctx context.Context, stage string, req *sdkproto
880880
}
881881
switchmsgType:=msg.Type.(type) {
882882
case*sdkproto.Provision_Response_Log:
883-
r.logger.Info(context.Background(),"workspaceprovision job logged",
883+
r.logProvisionerJobLog(context.Background(),msgType.Log.Level,"workspaceprovisioner job logged",
884884
slog.F("level",msgType.Log.Level),
885885
slog.F("output",msgType.Log.Output),
886886
slog.F("workspace_build_id",r.job.GetWorkspaceBuild().WorkspaceBuildId),
@@ -895,8 +895,9 @@ func (r *Runner) buildWorkspace(ctx context.Context, stage string, req *sdkproto
895895
})
896896
case*sdkproto.Provision_Response_Complete:
897897
ifmsgType.Complete.Error!="" {
898-
r.logger.Info(context.Background(),"provision failed; updating state",
898+
r.logger.Warn(context.Background(),"provision failed; updating state",
899899
slog.F("state_length",len(msgType.Complete.State)),
900+
slog.F("error",msgType.Complete.Error),
900901
)
901902

902903
returnnil,&proto.FailedJob{
@@ -1120,3 +1121,21 @@ func redactVariableValues(variableValues []*sdkproto.VariableValue) []*sdkproto.
11201121
}
11211122
returnredacted
11221123
}
1124+
1125+
// logProvisionerJobLog logs a message from the provisioner daemon at the appropriate level.
1126+
func (r*Runner)logProvisionerJobLog(ctx context.Context,logLevel sdkproto.LogLevel,msgstring,fields...slog.Field) {
1127+
switchlogLevel {
1128+
casesdkproto.LogLevel_TRACE:
1129+
r.logger.Debug(ctx,msg,fields...)// There's no trace, so we'll just use debug.
1130+
casesdkproto.LogLevel_DEBUG:
1131+
r.logger.Debug(ctx,msg,fields...)
1132+
casesdkproto.LogLevel_INFO:
1133+
r.logger.Info(ctx,msg,fields...)
1134+
casesdkproto.LogLevel_WARN:
1135+
r.logger.Warn(ctx,msg,fields...)
1136+
casesdkproto.LogLevel_ERROR:
1137+
r.logger.Error(ctx,msg,fields...)
1138+
default:// should never happen, but we should not explode either.
1139+
r.logger.Info(ctx,msg,fields...)
1140+
}
1141+
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp