8000 Add more log context · coder/coder@c0f6922 · GitHub
[go: up one dir, main page]
Skip to content

Commit c0f6922

Browse files
dannykoppingdannykopping
committed
Add more log context
Signed-off-by: Danny Kopping <dannykopping@gmail.com>
1 parent 95fcc6f commit c0f6922

File tree

3 files changed

+22
-11
lines changed

3 files changed

+22
-11
lines changed

‎coderd/database/queries.sql.go

Lines changed: 14 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/prebuilds.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ WHERE (b.transition = 'start'::workspace_transition
2222

2323
-- name: GetTemplatePresetsWithPrebuilds :many
2424
SELECT t.id AS template_id,
25+
t.name AS template_name,
2526
tv.id AS template_version_id,
27+
tv.name AS template_version_name,
2628
tv.id = t.active_version_id AS using_active_version,
2729
tvpp.preset_id,
2830
tvp.name,

‎enterprise/coderd/prebuilds/reconcile.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,9 @@ func (c *StoreReconciler) ReconcileAll(ctx context.Context) error {
184184

185185
if !preset.UsingActiveVersion && len(ps.Running) == 0 && len(ps.InProgress) == 0 {
186186
logger.Debug(ctx, "skipping reconciliation for preset; inactive, no running prebuilds, and no in-progress operations",
187-
slog.F("preset_id", preset.PresetID.String()))
187+
slog.F("template_id", preset.TemplateID.String()), slog.F("template_name", preset.TemplateName),
188+
slog.F("template_version_id", preset.TemplateVersionID.String()), slog.F("template_version_name", preset.TemplateVersionName),
189+
slog.F("preset_id", preset.PresetID.String()), slog.F("preset_name", preset.Name))
188190
continue
189191
}
190192

@@ -281,10 +283,11 @@ func (c *StoreReconciler) DetermineActions(ctx context.Context, state prebuilds.
281283
}
282284

283285
func (c *StoreReconciler) Reconcile(ctx context.Context, ps prebuilds.PresetState, actions prebuilds.ReconciliationActions) error {
284-
logger := c.logger.With(slog.F("template_id", ps.Preset.TemplateID.String()))
286+
logger := c.logger.With(slog.F("template_id", ps.Preset.TemplateID.String()), slog.F("template_name", ps.Preset.TemplateName))
285287

286288
var lastErr multierror.Error
287-
vlogger := logger.With(slog.F("template_version_id", ps.Preset.TemplateVersionID), slog.F("preset_id", ps.Preset.PresetID))
289+
vlogger := logger.With(slog.F("template_version_id", ps.Preset.TemplateVersionID), slog.F("template_version_name", ps.Preset.TemplateVersionName),
290+
slog.F("preset_id", ps.Preset.PresetID), slog.F("preset_name", ps.Preset.Name))
288291

289292
// TODO: authz // Can't use existing profiles (i.e. AsSystemRestricted) because of dbauthz rules
290293
ownerCtx := dbauthz.As(ctx, rbac.Subject{

0 commit comments

Comments
 (0)
0