Craftadoc/clsi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into jpa-entry-point-cleanup

Browse Source
This commit is contained in:
Jakob Ackermann
2020-04-03 14:05:36 +02:00
parent 3db40804ba 44f30d6c2e
commit 2bd4c1dbee
6 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/js/DockerRunner.js
View File

@@ -99,11 +99,7 @@ module.exports = DockerRunner = {
error, error,
output output
) { ) {
if ( if (error && error.statusCode === 500) {
__guard__(error != null ? error.message : undefined, x =>
x.match('HTTP code is 500')
)
) {
logger.log( logger.log(
{ err: error, project_id }, { err: error, project_id },
'error running container so destroying and retrying' 'error running container so destroying and retrying'

1
app/js/ResourceWriter.js
View File

@@ -324,6 +324,7 @@ module.exports = ResourceWriter = {
}, },
'error downloading file for resources' 'error downloading file for resources'
) )
Metrics.inc('download-failed')
} }
return callback() return callback()
} }

6
package-lock.json generated
View File

@@ -3816,9 +3816,9 @@
} }
}, },
"logger-sharelatex": { "logger-sharelatex": {
"version": "1.9.0", "version": "1.9.1",
"resolved": "https://registry.npmjs.org/logger-sharelatex/-/logger-sharelatex-1.9.0.tgz", "resolved": "https://registry.npmjs.org/logger-sharelatex/-/logger-sharelatex-1.9.1.tgz",
"integrity": "sha512-yVTuha82047IiMOQLgQHCZGKkJo6I2+2KtiFKpgkIooR2yZaoTEvAeoMwBesSDSpGUpvUJ/+9UI+PmRyc+PQKQ==", "integrity": "sha512-9s6JQnH/PN+Js2CmI8+J3MQCTNlRzP2Dh4pcekXrV6Jm5J4HzyPi+6d3zfBskZ4NBmaUVw9hC4p5dmdaRmh4mQ==",
"requires": { "requires": {
"@google-cloud/logging-bunyan": "^2.0.0", "@google-cloud/logging-bunyan": "^2.0.0",
"@overleaf/o-error": "^2.0.0", "@overleaf/o-error": "^2.0.0",

2
package.json
View File

@@ -26,7 +26,7 @@
"fs-extra": "^8.1.0", "fs-extra": "^8.1.0",
"heapdump": "^0.3.15", "heapdump": "^0.3.15",
"lockfile": "^1.0.4", "lockfile": "^1.0.4",
"logger-sharelatex": "^1.9.0", "logger-sharelatex": "^1.9.1",
"lynx": "0.2.0", "lynx": "0.2.0",
"metrics-sharelatex": "^2.6.0", "metrics-sharelatex": "^2.6.0",
"mysql": "^2.18.1", "mysql": "^2.18.1",

6
test/unit/js/DockerRunnerTests.js
View File

@@ -202,9 +202,9 @@ describe('DockerRunner', function() {
} }
if (firstTime) { if (firstTime) {
firstTime = false firstTime = false
return callback( const error = new Error('(HTTP code 500) server error - ...')
new Error('HTTP code is 500 which indicates error: server error') error.statusCode = 500
) return callback(error)
} else { } else {
return callback(null, this.output) return callback(null, this.output)
} }

1
test/unit/js/ResourceWriterTests.js
View File

@@ -36,6 +36,7 @@ describe('ResourceWriter', function() {
'./OutputFileFinder': (this.OutputFileFinder = {}), './OutputFileFinder': (this.OutputFileFinder = {}),
'logger-sharelatex': { log: sinon.stub(), err: sinon.stub() }, 'logger-sharelatex': { log: sinon.stub(), err: sinon.stub() },
'./Metrics': (this.Metrics = { './Metrics': (this.Metrics = {
inc: sinon.stub(),
Timer: (Timer = (function() { Timer: (Timer = (function() {
Timer = class Timer { Timer = class Timer {
static initClass() { static initClass() {