NoLog.cz/etherpad
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/node/handler/APIHandler.js
View file

@ -22,19 +22,24 @@
var ERR = require("async-stacktrace"); var ERR = require("async-stacktrace");
var fs = require("fs"); var fs = require("fs");
var api = require("../db/API"); var api = require("../db/API");
var log4js = require('log4js');
var padManager = require("../db/PadManager"); var padManager = require("../db/PadManager");
var randomString = require("../utils/randomstring"); var randomString = require("../utils/randomstring");
var argv = require('../utils/Cli').argv; var argv = require('../utils/Cli').argv;
var apiHandlerLogger = log4js.getLogger('APIHandler');
//ensure we have an apikey //ensure we have an apikey
var apikey = null; var apikey = null;
var apikeyFilename = argv.apikey || "./APIKEY.txt"; var apikeyFilename = argv.apikey || "./APIKEY.txt";
try try
{ {
apikey = fs.readFileSync(apikeyFilename,"utf8"); apikey = fs.readFileSync(apikeyFilename,"utf8");
apiHandlerLogger.info(`Api key file read from: "${apikeyFilename}"`);
} }
catch(e) catch(e)
{ {
apiHandlerLogger.info(`Api key file "${apikeyFilename}" not found. Creating with random contents.`);
apikey = randomString(32); apikey = randomString(32);
fs.writeFileSync(apikeyFilename,apikey,"utf8"); fs.writeFileSync(apikeyFilename,apikey,"utf8");
} }

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

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