diff --git a/lib/logging.js b/lib/logging.js index f96eddc..c45be07 100644 --- a/lib/logging.js +++ b/lib/logging.js @@ -10,19 +10,19 @@ scope = exports; } else { - if (require.exists("./logging")){ - scope = require("./logging"); - } - else { - scope = require.register("./logging", {}); - } + scope = require.register("./logging", {}); } let settings = false; - require.on("./settings", function(realSettings){ - settings = realSettings; - settings.loaded.then(scope.clearQueue); - }); + scope.setSettings = function(realSettings){ + if (!settings){ + settings = realSettings; + settings.loaded.then(scope.clearQueue); + } + else { + warning("logging: Settings can only be set once."); + } + }; var prefix = ""; @@ -108,7 +108,5 @@ scope.notice = notice; scope.verbose = verbose; - require.emit("./logging"); - metaLog("logging available"); }()); \ No newline at end of file diff --git a/lib/require.js b/lib/require.js index 13962c6..816d46d 100644 --- a/lib/require.js +++ b/lib/require.js @@ -38,28 +38,5 @@ const require = function(){ return scope.hasOwnProperty(getScopeName(module)); }; - var events = {}; - require.on = function(module, callback){ - var scopeName = getScopeName(module); - if (scope.hasOwnProperty(scopeName)){ - callback(scope[scopeName]); - } - else { - if (!events.hasOwnProperty(scopeName)){ - events[scopeName] = []; - } - events[scopeName].push(callback); - } - }; - require.emit = function(module){ - var scopeName = getScopeName(module); - if (events[scopeName]){ - events[scopeName].forEach(function(callback){ - callback(scope[scopeName]); - }); - events[scopeName] = []; - } - }; - return require; }(); \ No newline at end of file diff --git a/lib/settings.js b/lib/settings.js index 3d51425..1f5eacd 100644 --- a/lib/settings.js +++ b/lib/settings.js @@ -466,5 +466,5 @@ }; Object.seal(scope); - require.emit("./settings"); + logging.setSettings(scope); }(require)); \ No newline at end of file