X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2Fmkws-core.js;h=528ed94c2e55ce0942f1796976d3186ed3d91466;hp=2b258073e28781efebf914a04e91f18a10cf3f99;hb=8951e05ba26465e3d86d2909a83db67ffee49e28;hpb=7b6b1d731e85c96c95101e444364eca4ab03782c

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 2b25807..528ed94 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -111,25 +111,14 @@ mkws.stringToLevel = function(s) {
 
 mkws.logger = JL('mkws');
 var consoleAppender = JL.createConsoleAppender('consoleAppender');
-mkws.logger.setOptions({ "appenders": [consoleAppender],
-                         "level": mkws.stringToLevel(mkws.log_level) });
+mkws.logger.setOptions({ "appenders": [consoleAppender] });
 
 
-function _log(fn, string) {
-  if (!mkws.log_level)
-    return;
-
-  // you need to disable use strict at the top of the file!!!
-  if (mkws.log_level >= 3) {
-    // Works in Chrome; not sure about elsewhere
-    console.trace();
-  } else if (mkws.log_level >= 2) {
-
-  }
-  fn.call(mkws.logger, string);
+function _log() {
+  var argsAsARealArray = Array.prototype.slice.call(arguments);
+  var fn = argsAsARealArray.shift();
+  fn.apply(mkws.logger, argsAsARealArray);
 };
-
-
 mkws.trace = function(x) { _log(mkws.logger.trace, x) };
 mkws.debug = function(x) { _log(mkws.logger.debug, x) };
 mkws.info = function(x) { _log(mkws.logger.info, x) };
@@ -176,10 +165,6 @@ mkws.promotionFunction = function(name) {
 
 
 mkws.setMkwsConfig = function(overrides) {
-  // Set global log_level flag early so that _log() works
-  var tmp = overrides.log_level;
-  if (typeof(tmp) !== 'undefined') mkws.log_level = tmp;
-
   var config_default = {
     use_service_proxy: true,
     pazpar2_url: undefined,
@@ -679,4 +664,11 @@ mkws.info("Using window.name '" + window.name + "'");
     }
   });
 
+  // Set global log_level flag early so that _log() works
+  if (typeof mkws_config !== 'undefined') {
+    var tmp = mkws_config.log_level;
+    if (typeof tmp !== 'undefined') {
+      mkws.logger.setOptions({ "level": mkws.stringToLevel(tmp) });
+    }
+  }
 })(mkws.$);