github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #159 from overleaf/jpa-fix-docker-modem-error-scheme

Browse source 
[misc] keep up with the error signature of dockerode/docker-modem
This commit is contained in:
Jakob Ackermann 2020-04-03 14:04:06 +02:00 committed by GitHub
commit c700a0ab9d
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/clsi/app/js/DockerRunner.js
View file

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

6
services/clsi/test/unit/js/DockerRunnerTests.js
View file

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