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

Merge pull request #1211 from sharelatex/ta-fetch-v1-data-log-errors

Log Errors in fetchV1Data

GitOrigin-RevId: 4b709430c2ad97ca369e93eaa4c4edf5ad7f3f52
Simon Detheridge 7 лет назад
Родитель
Сommit
b69cc6ce77

+ 5 - 1
services/web/app/coffee/models/Institution.coffee

@@ -2,6 +2,7 @@ mongoose = require 'mongoose'
 Schema = mongoose.Schema
 ObjectId = Schema.ObjectId
 settings = require 'settings-sharelatex'
+logger = require 'logger-sharelatex'
 request = require 'request'
 
 InstitutionSchema = new Schema
@@ -12,7 +13,10 @@ InstitutionSchema = new Schema
 InstitutionSchema.method 'fetchV1Data', (callback = (error, institution)->) ->
 	url = "#{settings.apis.v1.url}/universities/list/#{this.v1Id}"
 	request.get url, (error, response, body) =>
-		try parsedBody = JSON.parse(body) catch e
+		try
+			parsedBody = JSON.parse(body)
+		catch error # log error and carry on without v1 data
+			logger.err { model: 'Institution', v1Id: this.v1Id, error }, '[fetchV1DataError]'
 		this.name = parsedBody?.name
 		this.countryCode = parsedBody?.country_code
 		this.departments = parsedBody?.departments

+ 5 - 1
services/web/app/coffee/models/Publisher.coffee

@@ -2,6 +2,7 @@ mongoose = require 'mongoose'
 Schema = mongoose.Schema
 ObjectId = Schema.ObjectId
 settings = require 'settings-sharelatex'
+logger = require 'logger-sharelatex'
 request = require 'request'
 
 PublisherSchema = new Schema
@@ -19,7 +20,10 @@ PublisherSchema.method 'fetchV1Data', (callback = (error, publisher)->) ->
 			pass: settings.apis.v1.pass
 			sendImmediately: true
 	}, (error, response, body) =>
-		try parsedBody = JSON.parse(body) catch e
+		try
+			parsedBody = JSON.parse(body)
+		catch error # log error and carry on without v1 data
+			logger.err { model: 'Publisher', slug: this.slug, error }, '[fetchV1DataError]'
 		this.name = parsedBody?.name
 		this.partner = parsedBody?.partner
 		callback(null, this)