fix(server/api): preserve 500-class messages via apierror.InternalMsg
The PR1-T2 admin handler migration replaced bespoke 500-class messages
("lookup failed", "refetch failed", "trigger failed", "bump failed",
"remove failed", "update failed", "schedule row missing", "re-read
failed", "read failed") with apierror.Internal(err), which forces the
wire Message to "internal server error". That violates the PR1
contract that errEnvelope{Code, Message} must remain byte-identical
for existing clients.
Add apierror.InternalMsg(message, cause) — a 500-class constructor
that preserves the call site's user-facing message while keeping the
cause attached for logging and errors.Is. Re-migrate the 12 admin
sites whose pre-1cc7eb6 source had a non-empty bespoke Message so
they restore the original wire string. Sites whose original Message
was empty stay on Internal(err) (humanization to "internal server
error" is a tolerable improvement, not a regression).
admin_smtp.go's send_failed site (line 129) was already preserved
via a raw &apierror.Error literal in 1cc7eb6 and needs no fix.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -90,7 +90,7 @@ func (h *handlers) handleUpdateCoverSource(w http.ResponseWriter, r *http.Reques
|
||||
return
|
||||
}
|
||||
h.logger.Error("admin: update cover source", "id", id, "err", err)
|
||||
writeErr(w, apierror.Internal(err))
|
||||
writeErr(w, apierror.InternalMsg("update failed", err))
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ func (h *handlers) handleGetLibraryCoverage(w http.ResponseWriter, r *http.Reque
|
||||
q := dbq.New(h.pool)
|
||||
row, err := q.GetAlbumCoverageRollup(r.Context())
|
||||
if err != nil {
|
||||
writeErrWithLog(w, h.logger, "admin: get coverage rollup", apierror.Internal(err))
|
||||
writeErrWithLog(w, h.logger, "admin: get coverage rollup", apierror.InternalMsg("lookup failed", err))
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, coverageRollupResp{
|
||||
|
||||
@@ -18,7 +18,7 @@ import (
|
||||
func (h *handlers) handleResearchMissingArt(w http.ResponseWriter, r *http.Request) {
|
||||
newVer, err := h.coverSettings.BumpVersion(r.Context())
|
||||
if err != nil {
|
||||
writeErrWithLog(w, h.logger, "admin: research missing art bump failed", apierror.Internal(err))
|
||||
writeErrWithLog(w, h.logger, "admin: research missing art bump failed", apierror.InternalMsg("bump failed", err))
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, map[string]any{"version": newVer})
|
||||
|
||||
@@ -32,12 +32,12 @@ func (h *handlers) handleAdminAlbumRefetchCover(w http.ResponseWriter, r *http.R
|
||||
writeErr(w, &apierror.Error{Status: http.StatusNotFound, Code: "not_found", Message: "album not found"})
|
||||
return
|
||||
}
|
||||
writeErrWithLog(w, h.logger, "admin: cover refetch failed", apierror.Internal(err))
|
||||
writeErrWithLog(w, h.logger, "admin: cover refetch failed", apierror.InternalMsg("refetch failed", err))
|
||||
return
|
||||
}
|
||||
row, err := dbq.New(h.pool).GetAlbumWithFirstTrackPath(r.Context(), albumID)
|
||||
if err != nil {
|
||||
writeErrWithLog(w, h.logger, "admin: post-refetch read failed", apierror.Internal(err))
|
||||
writeErrWithLog(w, h.logger, "admin: post-refetch read failed", apierror.InternalMsg("read failed", err))
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, adminCoverRefetchResp{
|
||||
|
||||
@@ -40,7 +40,7 @@ func (h *handlers) handleGetScanStatus(w http.ResponseWriter, r *http.Request) {
|
||||
writeJSON(w, http.StatusOK, scanStatusResp{InFlight: false})
|
||||
return
|
||||
}
|
||||
writeErrWithLog(w, h.logger, "admin: get scan status", apierror.Internal(err))
|
||||
writeErrWithLog(w, h.logger, "admin: get scan status", apierror.InternalMsg("lookup failed", err))
|
||||
return
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ func (h *handlers) handleTriggerScan(w http.ResponseWriter, _ *http.Request) {
|
||||
h.logger.With("source", "manual"), h.scanCfg,
|
||||
)
|
||||
if err != nil {
|
||||
writeErrWithLog(w, h.logger, "admin: trigger scan failed", apierror.Internal(err))
|
||||
writeErrWithLog(w, h.logger, "admin: trigger scan failed", apierror.InternalMsg("trigger failed", err))
|
||||
return
|
||||
}
|
||||
if !started {
|
||||
|
||||
@@ -35,10 +35,10 @@ func (h *handlers) handleGetScanSchedule(w http.ResponseWriter, r *http.Request)
|
||||
if err != nil {
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
h.logger.Error("admin: scan_schedule singleton row missing")
|
||||
writeErr(w, apierror.Internal(errors.New("schedule row missing")))
|
||||
writeErr(w, apierror.InternalMsg("schedule row missing", errors.New("schedule row missing")))
|
||||
return
|
||||
}
|
||||
writeErrWithLog(w, h.logger, "admin: get scan schedule", apierror.Internal(err))
|
||||
writeErrWithLog(w, h.logger, "admin: get scan schedule", apierror.InternalMsg("lookup failed", err))
|
||||
return
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ func (h *handlers) handlePatchScanSchedule(w http.ResponseWriter, r *http.Reques
|
||||
TimeOfDay: req.TimeOfDay,
|
||||
WeeklyDay: pgInt32Ptr(req.WeeklyDay),
|
||||
}); err != nil {
|
||||
writeErrWithLog(w, h.logger, "admin: update scan schedule", apierror.Internal(err))
|
||||
writeErrWithLog(w, h.logger, "admin: update scan schedule", apierror.InternalMsg("update failed", err))
|
||||
return
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ func (h *handlers) handlePatchScanSchedule(w http.ResponseWriter, r *http.Reques
|
||||
|
||||
row, err := q.GetScanSchedule(r.Context())
|
||||
if err != nil {
|
||||
writeErrWithLog(w, h.logger, "admin: re-read scan schedule", apierror.Internal(err))
|
||||
writeErrWithLog(w, h.logger, "admin: re-read scan schedule", apierror.InternalMsg("re-read failed", err))
|
||||
return
|
||||
}
|
||||
cfg := library.ScheduleConfig{Mode: row.Mode}
|
||||
|
||||
@@ -69,7 +69,7 @@ func (h *handlers) handleRemoveTrack(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
h.logger.Error("api: remove track failed", "err", err, "track_id", idStr)
|
||||
writeErr(w, apierror.Internal(err))
|
||||
writeErr(w, apierror.InternalMsg("remove failed", err))
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user