diff --git a/src/node/db/SessionManager.js b/src/node/db/SessionManager.js index f8000e47e..518c70c7a 100644 --- a/src/node/db/SessionManager.js +++ b/src/node/db/SessionManager.js @@ -353,7 +353,7 @@ function listSessionsWithDBKey (dbkey, callback) { if (err == "apierror: sessionID does not exist") { - console.warn("Found bad session " + sessionID + " in " + dbkey + "."); + console.warn(`Found bad session ${sessionID} in ${dbkey}`); } else if(ERR(err, callback)) { diff --git a/src/node/hooks/express.js b/src/node/hooks/express.js index 48dcf56cb..e7b373805 100644 --- a/src/node/hooks/express.js +++ b/src/node/hooks/express.js @@ -12,15 +12,15 @@ var serverName; exports.createServer = function () { console.log("Report bugs at https://github.com/ether/etherpad-lite/issues") - serverName = "Etherpad " + settings.getGitCommit() + " (http://etherpad.org)"; + serverName = `Etherpad ${settings.getGitCommit()} (http://etherpad.org)`; - console.log("Your Etherpad version is " + settings.getEpVersion() + " (" + settings.getGitCommit() + ")"); + console.log(`Your Etherpad version is ${settings.getEpVersion()} (${settings.getGitCommit()})`); exports.restartServer(); - console.log("You can access your Etherpad instance at http://" + settings.ip + ":" + settings.port + "/"); + console.log(`You can access your Etherpad instance at http://${settings.ip}:${settings.port}/`); if(!_.isEmpty(settings.users)){ - console.log("The plugin admin page is at http://" + settings.ip + ":" + settings.port + "/admin/plugins"); + console.log(`The plugin admin page is at http://${settings.ip}:${settings.port}/admin/plugins`); } else{ console.warn("Admin username and password not set in settings.json. To access admin please uncomment and edit 'users' in settings.json"); @@ -42,9 +42,9 @@ exports.restartServer = function () { if (settings.ssl) { - console.log( "SSL -- enabled"); - console.log( "SSL -- server key file: " + settings.ssl.key ); - console.log( "SSL -- Certificate Authority's certificate file: " + settings.ssl.cert ); + console.log("SSL -- enabled"); + console.log(`SSL -- server key file: ${settings.ssl.key}`); + console.log(`SSL -- Certificate Authority's certificate file: ${settings.ssl.cert}`); var options = { key: fs.readFileSync( settings.ssl.key ), diff --git a/src/node/utils/Abiword.js b/src/node/utils/Abiword.js index 1d9ac5d30..2aae5a8ac 100644 --- a/src/node/utils/Abiword.js +++ b/src/node/utils/Abiword.js @@ -52,7 +52,7 @@ if(os.type().indexOf("Windows") > -1) abiword.on('exit', function (code) { if(code != 0) { - return callback("Abiword died with exit code " + code); + return callback(`Abiword died with exit code ${code}`); } if(stdoutBuffer != "") @@ -91,7 +91,7 @@ else abiword.on('exit', function (code) { spawnAbiword(); - stdoutCallback("Abiword died with exit code " + code); + stdoutCallback(`Abiword died with exit code ${code}`); }); //delegate the processing of stdout to a other function diff --git a/src/node/utils/LibreOffice.js b/src/node/utils/LibreOffice.js index 9127d18d2..6f049d224 100644 --- a/src/node/utils/LibreOffice.js +++ b/src/node/utils/LibreOffice.js @@ -84,7 +84,7 @@ function doConvertTask(task, callback) { // Throw an exception if libreoffice failed soffice.on('exit', function(code) { if (code != 0) { - return callback("LibreOffice died with exit code " + code + " and message: " + stdoutBuffer); + return callback(`LibreOffice died with exit code ${code} and message: ${stdoutBuffer}`); } callback(); diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 648ecbbbd..508e6148d 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -396,7 +396,7 @@ exports.reloadSettings = function reloadSettings() { //test if the setting start with a lowercase character if(i.charAt(0).search("[a-z]") !== 0) { - console.warn("Settings should start with a lowercase character: '" + i + "'"); + console.warn(`Settings should start with a lowercase character: '${i}'`); } //we know this setting, so we overwrite it @@ -412,7 +412,7 @@ exports.reloadSettings = function reloadSettings() { //this setting is unkown, output a warning and throw it away else { - console.warn("Unknown Setting: '" + i + "'. This setting doesn't exist or it was removed"); + console.warn(`Unknown Setting: '${i}'. This setting doesn't exist or it was removed`); } } @@ -422,7 +422,7 @@ exports.reloadSettings = function reloadSettings() { //test if the setting start with a lowercase character if(i.charAt(0).search("[a-z]") !== 0) { - console.warn("Settings should start with a lowercase character: '" + i + "'"); + console.warn(`Settings should start with a lowercase character: '${i}'`); } //we know this setting, so we overwrite it @@ -438,7 +438,7 @@ exports.reloadSettings = function reloadSettings() { //this setting is unkown, output a warning and throw it away else { - console.warn("Unknown Setting: '" + i + "'. This setting doesn't exist or it was removed"); + console.warn(`Unknown Setting: '${i}'. This setting doesn't exist or it was removed`); } }