Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 12:05:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

temp fix for #6848

Browse Source
This commit is contained in:
Baris Usakli
2018-10-19 12:48:39 -04:00
parent 48aff2584a
commit a6c70412db
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/reset.js
View File

@@ -151,7 +151,7 @@ function resetPlugin(pluginId, callback) {
},
], function (err) {
if (err) {
winston.error('[reset] Could not disable plugin: %s encountered error %s', pluginId, err);
winston.error('[reset] Could not disable plugin: ' + pluginId + ' encountered error %s', err);
} else if (active) {
winston.info('[reset] Plugin `%s` disabled', pluginId);
} else {

16
src/prestart.js
View File

@@ -12,6 +12,22 @@ function setupWinston() {
if (!winston.format) {
return;
}
// allow winton.error to log error objects properly
// https://github.com/NodeBB/NodeBB/issues/6848
const winstonError = winston.error;
winston.error = function (msg, error) {
if (msg instanceof Error) {
winstonError(msg);
} else if (error instanceof Error) {
msg = msg + '\n' + error.stack;
winstonError(msg);
} else {
winstonError.apply(null, arguments);
}
};
// https://github.com/winstonjs/winston/issues/1338
// error objects are not displayed properly
const enumerateErrorFormat = winston.format((info) => {