diff --git a/js/app.js b/js/app.js index 7cf7dd2e..b1fcc9bb 100644 --- a/js/app.js +++ b/js/app.js @@ -202,6 +202,8 @@ var App = function () { loadConfig(function (c) { config = c; + Log.setLogLevel(config.logLevel); + var modules = []; for (var m in config.modules) { diff --git a/js/logger.js b/js/logger.js index 157420a7..122ba81a 100644 --- a/js/logger.js +++ b/js/logger.js @@ -32,13 +32,15 @@ timeStamp: Function.prototype.bind.call(console.timeStamp, console) }; - if (config && config.logLevel) { - Object.keys(logLevel).forEach(function (key, index) { - if (!config.logLevel.includes(key.toLocaleUpperCase())) { - logLevel[key] = function () {}; - } - }); - } + logLevel.setLogLevel = function (newLevel) { + if (newLevel) { + Object.keys(logLevel).forEach(function (key, index) { + if (!newLevel.includes(key.toLocaleUpperCase())) { + logLevel[key] = function () {}; + } + }); + } + }; return logLevel; }); diff --git a/js/main.js b/js/main.js index 07459f0f..dc1667af 100644 --- a/js/main.js +++ b/js/main.js @@ -477,6 +477,9 @@ var MM = (function () { init: function () { Log.info("Initializing MagicMirror."); loadConfig(); + + Log.setLogLevel(config.logLevel); + Translator.loadCoreTranslations(config.language); Loader.loadModules(); },