mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
chore: ensure logs consistency across Coder (#8083)
This commit is contained in:
+2
-2
@@ -126,7 +126,7 @@ func (r *RootCmd) workspaceAgent() *clibase.Cmd {
|
||||
reaper.WithCatchSignals(InterruptSignals...),
|
||||
)
|
||||
if err != nil {
|
||||
logger.Error(ctx, "failed to reap", slog.Error(err))
|
||||
logger.Error(ctx, "agent process reaper unable to fork", slog.Error(err))
|
||||
return xerrors.Errorf("fork reap: %w", err)
|
||||
}
|
||||
|
||||
@@ -163,7 +163,7 @@ func (r *RootCmd) workspaceAgent() *clibase.Cmd {
|
||||
logger := slog.Make(sinks...).Leveled(slog.LevelDebug)
|
||||
|
||||
version := buildinfo.Version()
|
||||
logger.Info(ctx, "starting agent",
|
||||
logger.Info(ctx, "agent is starting now",
|
||||
slog.F("url", r.agentURL),
|
||||
slog.F("auth", auth),
|
||||
slog.F("version", version),
|
||||
|
||||
+2
-2
@@ -54,7 +54,7 @@ func TestWorkspaceAgent(t *testing.T) {
|
||||
|
||||
clitest.Start(t, inv)
|
||||
ctx := inv.Context()
|
||||
pty.ExpectMatchContext(ctx, "starting agent")
|
||||
pty.ExpectMatchContext(ctx, "agent is starting now")
|
||||
|
||||
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
|
||||
|
||||
@@ -270,7 +270,7 @@ func TestWorkspaceAgent(t *testing.T) {
|
||||
pty := ptytest.New(t).Attach(inv)
|
||||
|
||||
clitest.Start(t, inv)
|
||||
pty.ExpectMatchContext(inv.Context(), "starting agent")
|
||||
pty.ExpectMatchContext(inv.Context(), "agent is starting now")
|
||||
|
||||
resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
|
||||
require.Len(t, resources, 1)
|
||||
|
||||
+3
-3
@@ -455,7 +455,7 @@ func watchAndClose(ctx context.Context, closer func() error, logger slog.Logger,
|
||||
|
||||
startWatchLoop:
|
||||
for {
|
||||
logger.Debug(ctx, "(re)connecting to the coder server to watch workspace events.")
|
||||
logger.Debug(ctx, "connecting to the coder server to watch workspace events")
|
||||
var wsWatch <-chan codersdk.Workspace
|
||||
var err error
|
||||
for r := retry.New(time.Second, 15*time.Second); r.Wait(ctx); {
|
||||
@@ -464,7 +464,7 @@ startWatchLoop:
|
||||
break
|
||||
}
|
||||
if ctx.Err() != nil {
|
||||
logger.Info(ctx, "context expired", slog.Error(ctx.Err()))
|
||||
logger.Debug(ctx, "context expired", slog.Error(ctx.Err()))
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -472,7 +472,7 @@ startWatchLoop:
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
logger.Info(ctx, "context expired", slog.Error(ctx.Err()))
|
||||
logger.Debug(ctx, "context expired", slog.Error(ctx.Err()))
|
||||
return
|
||||
case w, ok := <-wsWatch:
|
||||
if !ok {
|
||||
|
||||
Reference in New Issue
Block a user