mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 16:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

log4js: Initialize as early as possible

Browse source
This commit is contained in:
Richard Hansen 2021-09-23 03:05:42 -04:00
parent 7653dc650d
commit b3b6c94b76
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/node/utils/Settings.js
View file

@ -41,6 +41,21 @@ const _ = require('underscore');
const logger = log4js.getLogger('settings'); const logger = log4js.getLogger('settings');
// This is a function to make it easy to create a new instance. It is important to not reuse a
// config object after passing it to log4js.configure() because that method mutates the object. :(
const defaultLogConfig = () => ({appenders: [{type: 'console'}]});
const defaultLogLevel = 'INFO';
const initLogging = (logLevel, config) => {
log4js.configure(config);
log4js.setGlobalLogLevel(logLevel);
log4js.replaceConsole();
};
// Initialize logging as early as possible with reasonable defaults. Logging will be re-initialized
// with the user's chosen log level and logger config after the settings have been loaded.
initLogging(defaultLogLevel, defaultLogConfig());
/* Root path of the installation */ /* Root path of the installation */
exports.root = absolutePaths.findEtherpadRoot(); exports.root = absolutePaths.findEtherpadRoot();
logger.info('All relative paths will be interpreted relative to the identified ' + logger.info('All relative paths will be interpreted relative to the identified ' +
@ -236,7 +251,7 @@ exports.allowUnknownFileEnds = true;
/** /**
* The log level of log4js * The log level of log4js
*/ */
exports.loglevel = 'INFO'; exports.loglevel = defaultLogLevel;
/** /**
* Disable IP logging * Disable IP logging
@ -266,7 +281,7 @@ exports.indentationOnNewLine = true;
/* /*
* log4js appender configuration * log4js appender configuration
*/ */
exports.logconfig = {appenders: [{type: 'console'}]}; exports.logconfig = defaultLogConfig();
/* /*
* Session Key, do not sure this. * Session Key, do not sure this.
@ -703,9 +718,7 @@ exports.reloadSettings = () => {
storeSettings(settings); storeSettings(settings);
storeSettings(credentials); storeSettings(credentials);
log4js.configure(exports.logconfig);// Configure the logging appenders initLogging(exports.loglevel, exports.logconfig);
log4js.setGlobalLogLevel(exports.loglevel);// set loglevel
log4js.replaceConsole();
if (!exports.skinName) { if (!exports.skinName) {
logger.warn('No "skinName" parameter found. Please check out settings.json.template and ' + logger.warn('No "skinName" parameter found. Please check out settings.json.template and ' +