Fixing DB load causing user logout. (#8559)

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 err.StatusCode == http.StatusInternalServerError {
-			if h.requireSession {
+				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 {

app/session.go

@@ -54,6 +54,8 @@ func (a *App) GetSession(token string) (*model.Session, *model.AppError) {
 					a.AddSessionToCache(session)
 				}
 			}
+		} else if sessionResult.Err.StatusCode == http.StatusInternalServerError {
+			return nil, sessionResult.Err
 		}
 	}