mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-19 09:45:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix dmpWorker logging

Browse source 
dmpWorker is run as a childProcess, which is a completely separate
nodejs instance. As such, the `logger` it obtains is a separate instance
than the one in the parent. The parent reads the config file to
determine the log level, but the childProcess does not. So the log level
used in dmpWorker is always `debug`, regardless of the configuration
options.

In addition to polluting the logs, this is potentially a privacy issue,
because `dmpWorker` logs the diffs of notes at the `debug` level, which
will then enter the system logs.

This commit fixes this by making `dmpWorker` send any messages back to
the parent, who is responsible for logging. This also avoids any
potential race conditions between the two loggers writing to the same
output.

Fixes #433

Signed-off-by: Dexter Chua <dec41@srcf.net>
This commit is contained in:
Dexter Chua 2020-07-03 17:42:14 +08:00
parent 370916e951
commit efaa402dca
2 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/lib/models/revision.ts
View file

@ -21,6 +21,7 @@ class Data {
cacheKey
error
result
level
}
function createDmpWorker (): ChildProcess {
@ -33,6 +34,10 @@ function createDmpWorker (): ChildProcess {
}
const cacheKey = data.cacheKey
switch (data.msg) {
case 'log':
logger.log(data.level, data.result[0], ...data.result[1])
// The cacheKey is a dummy value and we want to skip the delete line.
return
case 'error':
dmpCallbackCache[cacheKey](data.error, null)
break