aboutsummaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorpg9182 <96569817+pg9182@users.noreply.github.com>2022-10-24 16:25:36 -0400
committerpg9182 <96569817+pg9182@users.noreply.github.com>2022-10-24 16:25:36 -0400
commitb88653083bc6fcb8031548dbf4b4c4261de2873a (patch)
tree45d7cc40924352f4a02792e2f56f8f968628a778 /pkg
parentc4df0faa5a2eaa0fb0bae9fbe858e9f423425c9f (diff)
downloadAtlas-b88653083bc6fcb8031548dbf4b4c4261de2873a.tar.gz
Atlas-b88653083bc6fcb8031548dbf4b4c4261de2873a.zip
pkg/api/api0: Suppress error logs for aborted requests
Diffstat (limited to 'pkg')
-rw-r--r--pkg/api/api0/client.go28
1 files changed, 17 insertions, 11 deletions
diff --git a/pkg/api/api0/client.go b/pkg/api/api0/client.go
index 1cf222e..87d5345 100644
--- a/pkg/api/api0/client.go
+++ b/pkg/api/api0/client.go
@@ -134,6 +134,8 @@ func (h *Handler) handleClientOriginAuth(w http.ResponseWriter, r *http.Request)
h.m().client_originauth_stryder_auth_duration_seconds.UpdateDuration(stryderStart)
if err != nil {
switch {
+ case errors.Is(err, context.Canceled):
+ // ignore
case errors.Is(err, stryder.ErrInvalidGame):
h.m().client_originauth_requests_total.reject_stryder_invalidgame.Inc()
case errors.Is(err, stryder.ErrInvalidToken):
@@ -169,12 +171,14 @@ func (h *Handler) handleClientOriginAuth(w http.ResponseWriter, r *http.Request)
respFail(w, r, http.StatusInternalServerError, ErrorCode_INTERNAL_SERVER_ERROR.MessageObj())
return
default:
- hlog.FromRequest(r).Error().
- Err(err).
- Uint64("uid", uid).
- Str("stryder_token", string(token)).
- Str("stryder_resp", string(stryderRes)).
- Msgf("unexpected stryder error")
+ if !errors.Is(err, context.Canceled) {
+ hlog.FromRequest(r).Error().
+ Err(err).
+ Uint64("uid", uid).
+ Str("stryder_token", string(token)).
+ Str("stryder_resp", string(stryderRes)).
+ Msgf("unexpected stryder error")
+ }
respFail(w, r, http.StatusInternalServerError, ErrorCode_INTERNAL_SERVER_ERROR.MessageObjf("stryder is down: %v", err))
return
}
@@ -211,7 +215,7 @@ func (h *Handler) handleClientOriginAuth(w http.ResponseWriter, r *http.Request)
Msgf("origin auth token refresh failure")
h.m().client_originauth_origin_username_lookup_calls_total.fail_authtok_refresh.Inc()
}
- } else {
+ } else if !errors.Is(err, context.Canceled) {
hlog.FromRequest(r).Error().
Err(err).
Msgf("failed to get origin user info")
@@ -416,10 +420,12 @@ func (h *Handler) handleClientAuthWithServer(w http.ResponseWriter, r *http.Requ
h.m().client_authwithserver_requests_total.fail_gameserverauth.Inc()
respFail(w, r, http.StatusInternalServerError, ErrorCode_BAD_GAMESERVER_RESPONSE.MessageObj())
default:
- hlog.FromRequest(r).Error().
- Err(err).
- Msgf("failed to make gameserver auth request")
- h.m().client_authwithserver_requests_total.fail_gameserverauth.Inc()
+ if !errors.Is(err, context.Canceled) {
+ hlog.FromRequest(r).Error().
+ Err(err).
+ Msgf("failed to make gameserver auth request")
+ h.m().client_authwithserver_requests_total.fail_gameserverauth.Inc()
+ }
respFail(w, r, http.StatusInternalServerError, ErrorCode_INTERNAL_SERVER_ERROR.MessageObj())
}
return