Skip to content

Commit de9e73a

Browse files
committed
improve errors handling
1 parent 15a3837 commit de9e73a

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

coderd/provisionerdserver/acquirer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ func TestAcquirer_MatchTags(t *testing.T) {
548548
lines = append(lines, s)
549549
}
550550
t.Logf("You can paste this into docs/admin/provisioners.md")
551-
t.Logf(strings.Join(lines, "\n"))
551+
t.Log("%s", strings.Join(lines, "\n"))
552552
})
553553
}
554554

coderd/provisionerdserver/provisionerdserver.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -1929,13 +1929,16 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
19291929

19301930
if prAgent.ResourcesMonitoring != nil {
19311931
if prAgent.ResourcesMonitoring.Memory != nil {
1932-
db.InsertWorkspaceAgentResourceMonitor(ctx, database.InsertWorkspaceAgentResourceMonitorParams{
1932+
_, err = db.InsertWorkspaceAgentResourceMonitor(ctx, database.InsertWorkspaceAgentResourceMonitorParams{
19331933
AgentID: agentID,
19341934
Rtype: database.WorkspaceAgentMonitoredResourceTypeMemory,
19351935
Enabled: prAgent.ResourcesMonitoring.Memory.Enabled,
19361936
Threshold: prAgent.ResourcesMonitoring.Memory.Threshold,
19371937
CreatedAt: dbtime.Now(),
19381938
})
1939+
if err != nil {
1940+
return xerrors.Errorf("insert agent resource monitor: %w", err)
1941+
}
19391942
}
19401943

19411944
for volume, monitor := range prAgent.ResourcesMonitoring.Volumes {
@@ -1946,14 +1949,17 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
19461949
return xerrors.Errorf("marshal metadata: %w", err)
19471950
}
19481951

1949-
db.InsertWorkspaceAgentResourceMonitor(ctx, database.InsertWorkspaceAgentResourceMonitorParams{
1952+
_, err = db.InsertWorkspaceAgentResourceMonitor(ctx, database.InsertWorkspaceAgentResourceMonitorParams{
19501953
AgentID: agentID,
19511954
Rtype: database.WorkspaceAgentMonitoredResourceTypeVolume,
19521955
Enabled: monitor.Enabled,
19531956
Threshold: monitor.Threshold,
19541957
Metadata: marshaledMetadata,
19551958
CreatedAt: dbtime.Now(),
19561959
})
1960+
if err != nil {
1961+
return xerrors.Errorf("insert agent resource monitor: %w", err)
1962+
}
19571963
}
19581964
}
19591965

0 commit comments

Comments
 (0)