Просмотр исходного кода

Merge pull request #295 from sharelatex/msw-history-failure

Bail out if history API request fails
Shane Kilkelly 8 лет назад
Родитель
Сommit
ba31df3dae
1 измененных файлов с 8 добавлено и 3 удалено
  1. 8 3
      services/web/app/coffee/Features/History/HistoryController.coffee

+ 8 - 3
services/web/app/coffee/Features/History/HistoryController.coffee

@@ -46,9 +46,14 @@ module.exports = HistoryController =
 				"X-User-Id": user_id
 		}, (error, response, body) ->
 			return next(error) if error?
-			HistoryManager.injectUserDetails body, (error, data) ->
-				return next(error) if error?
-				res.json data
+			if 200 <= res.statusCode < 300
+				HistoryManager.injectUserDetails body, (error, data) ->
+					return next(error) if error?
+					res.json data
+			else
+				error = new Error("history api responded with non-success code: #{res.statusCode}")
+				logger.error err: error, user_id: user_id, "error proxying request to history api"
+				next(error)
 
 	buildHistoryServiceUrl: (useProjectHistory) ->
 		# choose a history service, either document-level (trackchanges)