Skip to content

feat: use named loggers in coderd #8148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 22, 2023
Merged

feat: use named loggers in coderd #8148

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
97ddf3a
workspace build error
mtojek Jun 22, 2023
f7e87a0
provisioner job error
mtojek Jun 22, 2023
54d5546
prometheusmetrics error
mtojek Jun 22, 2023
4cf9115
userauth
mtojek Jun 22, 2023
b03a208
fix: ignore errors
mtojek Jun 22, 2023
6f89a92
Use named loggers
mtojek Jun 22, 2023
7e83891
no need for label here
mtojek Jun 22, 2023
7c4d5c2
autobuild
mtojek Jun 22, 2023
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
Next Next commit
workspace build error
  • Loading branch information
@mtojek
mtojek committed Jun 22, 2023
commit 97ddf3a53f059e865234c63caaa11a1295e3ffac
2 changes: 1 addition & 1 deletion coderd/autobuild/lifecycle_executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func (e *Executor) runOnce(t time.Time) Stats {
Reason(reason)

if _, _, err := builder.Build(e.ctx, tx, nil); err != nil {
log.Error(e.ctx, "unable to transition workspace",
log.Error(e.ctx, "workspace build error",
slog.F("transition", nextTransition),
slog.Error(err),
)
Expand Down
6 changes: 6 additions & 0 deletions coderd/workspacebuilds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import (
"golang.org/x/exp/slices"
"golang.org/x/xerrors"

"cdr.dev/slog"

"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/db2sdk"
"github.com/coder/coder/coderd/database/dbauthz"
Expand Down Expand Up @@ -348,6 +350,10 @@ func (api *API) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
)
var buildErr wsbuilder.BuildError
if xerrors.As(err, &buildErr) {
if buildErr.Status == http.StatusInternalServerError {
api.Logger.Error(ctx, "workspace build error", slog.Error(buildErr.Wrapped))
}

httpapi.Write(ctx, rw, buildErr.Status, codersdk.Response{
Message: buildErr.Message,
Detail: buildErr.Error(),
Expand Down
4 changes: 4 additions & 0 deletions coderd/workspaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,10 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
}, nil)
var bldErr wsbuilder.BuildError
if xerrors.As(err, &bldErr) {
if bldErr.Status == http.StatusInternalServerError {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Am I the only one that reads this as "boulder"? 😂

api.Logger.Error(ctx, "workspace build error", slog.Error(bldErr.Wrapped))
}

httpapi.Write(ctx, rw, bldErr.Status, codersdk.Response{
Message: bldErr.Message,
Detail: bldErr.Error(),
Expand Down