From cf1688f94a6b7bb8c7f1f9f7ce61553bdec13991 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Mon, 2 Apr 2018 08:22:25 -0700 Subject: Fixing DB load causing user logout. (#8559) --- api4/context.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'api4') diff --git a/api4/context.go b/api4/context.go index 1f27431d2..9f3822633 100644 --- a/api4/context.go +++ b/api4/context.go @@ -125,8 +125,10 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { if err != nil { l4g.Info(utils.T("api.context.invalid_session.error"), err.Error()) - c.RemoveSessionCookie(w, r) - if h.requireSession { + if err.StatusCode == http.StatusInternalServerError { + c.Err = err + } else if h.requireSession { + c.RemoveSessionCookie(w, r) c.Err = model.NewAppError("ServeHTTP", "api.context.session_expired.app_error", nil, "token="+token, http.StatusUnauthorized) } } else if !session.IsOAuth && tokenLocation == app.TokenLocationQueryString { -- cgit v1.2.3-1-g7c22