Merge branch 'master' of github.com:xwiki-labs/cryptpad

This commit is contained in:
ansuz 2020-01-08 12:56:13 -05:00
commit a55233f794
1 changed files with 8 additions and 1 deletions

View File

@ -8,7 +8,14 @@ try {
console.log("You can configure the administrator email (adminEmail) in your config/config.js file");
}
} catch (e) {
console.log("Config not found, loading the example config. You can customize the configuration by copying config/config.example.js to " + configPath);
if (e instanceof SyntaxError) {
console.error("config/config.js is faulty. See stacktrace below for more information. Terminating. \n");
console.error(e.name + ": " + e.message);
console.error(e.stack.split("\n\n")[0]);
process.exit(1);
} else {
console.log("Config not found, loading the example config. You can customize the configuration by copying config/config.example.js to " + configPath);
}
config = require("../config/config.example");
}
module.exports = config;