Skip to content

Commit 71aa0c9

Browse files
authored
fix: jobs/worker - pass through job error from worker process (#3822)
1 parent a20f70e commit 71aa0c9

File tree

4 files changed

+22
-5
lines changed

4 files changed

+22
-5
lines changed

server/core/scheduler.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,22 @@ class Job {
5555
`--job=${this.name}`,
5656
`--data=${data}`
5757
], {
58-
cwd: WIKI.ROOTPATH
58+
cwd: WIKI.ROOTPATH,
59+
stdio: ['inherit', 'inherit', 'pipe', 'ipc']
5960
})
61+
const stderr = [];
62+
proc.stderr.on('data', chunk => stderr.push(chunk))
6063
this.finished = new Promise((resolve, reject) => {
6164
proc.on('exit', (code, signal) => {
65+
const data = Buffer.concat(stderr).toString()
6266
if (code === 0) {
63-
resolve()
67+
resolve(data)
6468
} else {
65-
reject(signal)
69+
const err = new Error(`Error when running job ${this.name}: ${data}`)
70+
err.exitSignal = signal
71+
err.exitCode = code
72+
err.stderr = data
73+
reject(err)
6674
}
6775
proc.kill()
6876
})

server/core/worker.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ WIKI.logger = require('./logger').init('JOB')
1414
const args = require('yargs').argv
1515

1616
;(async () => {
17-
await require(`../jobs/${args.job}`)(args.data)
18-
process.exit(0)
17+
try {
18+
await require(`../jobs/${args.job}`)(args.data)
19+
process.exit(0)
20+
} catch (e) {
21+
await new Promise(resolve => process.stderr.write(e.message, resolve))
22+
process.exit(1)
23+
}
1924
})()

server/jobs/rebuild-tree.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,7 @@ module.exports = async (pageId) => {
7474
} catch (err) {
7575
WIKI.logger.error(`Rebuilding page tree: [ FAILED ]`)
7676
WIKI.logger.error(err.message)
77+
// exit process with error code
78+
throw err
7779
}
7880
}

server/jobs/render-page.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,7 @@ module.exports = async (pageId) => {
9090
} catch (err) {
9191
WIKI.logger.error(`Rendering page ID ${pageId}: [ FAILED ]`)
9292
WIKI.logger.error(err.message)
93+
// exit process with error code
94+
throw err
9395
}
9496
}

0 commit comments

Comments
 (0)