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 33

Allow comments in the settings file

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-05-19 14:30:08 +01:00
parent 9849e81e08
commit b0a937d8de
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
node/settings.js
View file

@ -22,7 +22,10 @@ exports.dbType = "sqlite";
exports.dbSettings = { "filename" : "../var/sqlite.db" };
//read the settings sync
var settingsStr = fs.readFileSync("../settings.json");
var settingsStr = fs.readFileSync("../settings.json").toString();
//remove all comments
settingsStr = settingsStr.replace(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/gm,"").replace(/#.*/g,"").replace(/\/\/.*/g,"");
//try to parse the settings
var settings;
@ -33,8 +36,7 @@ try
catch(e)
{
console.error("There is a syntax error in your settings.json file");
console.error("We recommend http://jsonlint.com/ to find the mistake");
console.error(e.stack);
console.error(e.message);
process.exit(1);
}