From a714e41d498096199b95aedaa02d5df2b0baefa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20N=C3=B6thlich?= Date: Sat, 4 Jan 2020 23:58:01 +0100 Subject: [PATCH] Log errors in faulty custom config file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CryptPAD now terminates and does not fallback to default config if the custom config is faulty. The error in the custom config is logged to the terminal now. Signed-off-by: Adrian Nöthlich --- lib/load-config.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/load-config.js b/lib/load-config.js index 80f4706dc..0756c2df4 100644 --- a/lib/load-config.js +++ b/lib/load-config.js @@ -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;