mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 17:36:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

settings, APIHandler: generate more informative logs

Browse source
This commit is contained in:
muxator 2018-08-21 00:05:15 +02:00
parent b635371d52
commit ec5573f88c
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -358,15 +358,18 @@ exports.reloadSettings = function reloadSettings() {
try{
//read the settings sync
settingsStr = fs.readFileSync(settingsFilename).toString();
console.info(`Settings loaded from: ${settingsFilename}`);
} catch(e){
console.warn('No settings file found. Continuing using defaults!');
console.warn(`No settings file found in ${settingsFilename}. Continuing using defaults!`);
}
try{
//read the credentials sync
credentialsStr = fs.readFileSync(credentialsFilename).toString();
console.info(`Credentials file read from: ${credentialsFilename}`);
} catch(e){
// Doesn't matter if no credentials file found..
console.info(`No credentials file found in ${credentialsFilename}. Ignoring.`);
}
// try to parse the settings
@ -378,7 +381,7 @@ exports.reloadSettings = function reloadSettings() {
settings = JSON.parse(settingsStr);
}
}catch(e){
console.error('There was an error processing your settings.json file: '+e.message);
console.error(`There was an error processing your settings file from ${settingsFilename}:` + e.message);
process.exit(1);
}
@ -479,7 +482,9 @@ exports.reloadSettings = function reloadSettings() {
var sessionkeyFilename = argv.sessionkey || "./SESSIONKEY.txt";
try {
exports.sessionKey = fs.readFileSync(sessionkeyFilename,"utf8");
console.info(`Session key loaded from: ${sessionkeyFilename}`);
} catch(e) {
console.info(`Session key file "${sessionkeyFilename}" not found. Creating with random contents.`);
exports.sessionKey = randomString(32);
fs.writeFileSync(sessionkeyFilename,exports.sessionKey,"utf8");
}