appium-logger - npm Package Compare versions

Comparing version 1.1.4 to 1.1.5

build/lib/logger.js

 'use strict';
 
+var _slicedToArray = require('babel-runtime/helpers/sliced-to-array')['default'];
+
 var _Object$defineProperty = require('babel-runtime/core-js/object/define-property')['default'];
@@ -56,5 +58,6 @@
   var forceLogMode = parseInt(process.env._FORCE_LOGS, 10) === 1;
+  var usingGlobalLog = !!global._global_npmlog;
   var logger = testingMode && !forceLogMode ? mockLog : global._global_npmlog || _npmlog2['default'];
   patchLogger(logger);
-  return logger;
+  return [logger, usingGlobalLog];
 }
@@ -65,3 +68,9 @@
 
-  var logger = _getLogger();
+  var _getLogger2 = _getLogger();
+
+  var _getLogger22 = _slicedToArray(_getLogger2, 2);
+
+  var logger = _getLogger22[0];
+  var usingGlobalLog = _getLogger22[1];
+
   var wrappedLogger = {};
@@ -110,3 +119,8 @@ _Object$defineProperty(wrappedLogger, 'level', {
   };
-  wrappedLogger.level = 'verbose';
+  if (!usingGlobalLog) {
+    // if we're not using a global log specified from some top-level package,
+    // set the log level to a default of verbose. Otherwise, let the top-level
+    // package set the log level
+    wrappedLogger.level = 'verbose';
+  }
   return wrappedLogger;
@@ -118,2 +132,2 @@ }
 exports['default'] = log;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9sb2dnZXIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O1FBUWdCLFdBQVcsR0FBWCxXQUFXO1FBZVgsU0FBUyxHQUFULFNBQVM7O3NCQXZCTixRQUFROzs7O0FBRTNCLElBQU0sU0FBUyxHQUFHLENBQUMsT0FBTyxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUM7QUFDakYsSUFBSSxPQUFPLEdBQUcsRUFBRSxDQUFDOzs7Ozs7QUFDakIsb0NBQWMsU0FBUyw0R0FBRTtRQUFoQixDQUFDOztBQUNSLFdBQU8sQ0FBQyxDQUFDLENBQUMsR0FBRyxZQUFNLEVBQUUsQ0FBQztHQUN2Qjs7Ozs7Ozs7Ozs7Ozs7OztBQUVNLFNBQVMsV0FBVyxDQUFDLE1BQU0sRUFBRTtBQUNsQyxNQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRTtBQUNqQixVQUFNLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQztHQUNyRTtDQUNGOztBQUVELFNBQVMsVUFBVSxHQUFJO0FBQ3JCLE1BQU0sV0FBVyxHQUFHLFFBQVEsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDN0QsTUFBTSxZQUFZLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUNqRSxNQUFJLE1BQU0sR0FBRyxBQUFDLFdBQVcsSUFBSSxDQUFDLFlBQVksR0FBSSxPQUFPLEdBQ2xELE1BQU0sQ0FBQyxjQUFjLHVCQUFVLEFBQUMsQ0FBQztBQUNwQyxhQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDcEIsU0FBTyxNQUFNLENBQUM7Q0FDZjs7QUFFTSxTQUFTLFNBQVMsR0FBZ0I7TUFBZixNQUFNLGdDQUFHLElBQUk7O0FBQ3JDLE1BQUksTUFBTSxHQUFHLFVBQVUsRUFBRSxDQUFDO0FBQzFCLE1BQUksYUFBYSxHQUFHLEVBQUUsQ0FBQztBQUN2Qix5QkFBc0IsYUFBYSxFQUFFLE9BQU8sRUFBRTtBQUM1QyxPQUFHLEVBQUUsZUFBWTtBQUFFLGFBQU8sTUFBTSxDQUFDLEtBQUssQ0FBQztLQUFFO0FBQ3pDLE9BQUcsRUFBRSxhQUFVLFFBQVEsRUFBRTtBQUFFLFlBQU0sQ0FBQyxLQUFLLEdBQUcsUUFBUSxDQUFDO0tBQUU7QUFDckQsY0FBVSxFQUFFLElBQUk7QUFDaEIsZ0JBQVksRUFBRSxJQUFJO0dBQ25CLENBQUMsQ0FBQzs7Ozs7O0FBQ0gsdUNBQWEsU0FBUyxpSEFBRTtVQUFoQixDQUFDOztBQUNQLG1CQUFhLENBQUMsQ0FBQyxDQUFDLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUM7S0FDbkQ7Ozs7Ozs7Ozs7Ozs7Ozs7QUFDRCxlQUFhLENBQUMsYUFBYSxHQUFHLFVBQVUsR0FBRyxFQUFFO0FBQzNDLFFBQUksRUFBRSxHQUFHLFlBQVksS0FBSyxDQUFBLEFBQUMsRUFBRTtBQUMzQixTQUFHLEdBQUcsSUFBSSxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7S0FDdEI7QUFDRCxRQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ2hCLFVBQU0sR0FBRyxDQUFDO0dBQ1gsQ0FBQztBQUNGLGVBQWEsQ0FBQyxLQUFLLEdBQUcsU0FBUyxDQUFDO0FBQ2hDLFNBQU8sYUFBYSxDQUFDO0NBQ3RCOztBQUVELElBQU0sR0FBRyxHQUFHLFNBQVMsRUFBRSxDQUFDOztxQkFFVCxHQUFHIiwiZmlsZSI6ImxpYi9sb2dnZXIuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgbnBtbG9nIGZyb20gJ25wbWxvZyc7XG5cbmNvbnN0IG5wbUxldmVscyA9IFsnc2lsbHknLCAndmVyYm9zZScsICdkZWJ1ZycsICdpbmZvJywgJ2h0dHAnLCAnd2FybicsICdlcnJvciddO1xubGV0IG1vY2tMb2cgPSB7fTtcbmZvciAobGV0IGwgb2YgbnBtTGV2ZWxzKSB7XG4gIG1vY2tMb2dbbF0gPSAoKSA9PiB7fTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHBhdGNoTG9nZ2VyKGxvZ2dlcikge1xuICBpZiAoIWxvZ2dlci5kZWJ1Zykge1xuICAgIGxvZ2dlci5hZGRMZXZlbCgnZGVidWcnLCAxMDAwLCB7IGZnOiAnYmx1ZScsIGJnOiAnYmxhY2snIH0sICdkYnVnJyk7XG4gIH1cbn1cblxuZnVuY3Rpb24gX2dldExvZ2dlciAoKSB7XG4gIGNvbnN0IHRlc3RpbmdNb2RlID0gcGFyc2VJbnQocHJvY2Vzcy5lbnYuX1RFU1RJTkcsIDEwKSA9PT0gMTtcbiAgY29uc3QgZm9yY2VMb2dNb2RlID0gcGFyc2VJbnQocHJvY2Vzcy5lbnYuX0ZPUkNFX0xPR1MsIDEwKSA9PT0gMTtcbiAgbGV0IGxvZ2dlciA9ICh0ZXN0aW5nTW9kZSAmJiAhZm9yY2VMb2dNb2RlKSA/IG1vY2tMb2cgOlxuICAgIChnbG9iYWwuX2dsb2JhbF9ucG1sb2cgfHwgbnBtbG9nKTtcbiAgcGF0Y2hMb2dnZXIobG9nZ2VyKTtcbiAgcmV0dXJuIGxvZ2dlcjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGdldExvZ2dlcihwcmVmaXggPSBudWxsKSB7XG4gIGxldCBsb2dnZXIgPSBfZ2V0TG9nZ2VyKCk7XG4gIGxldCB3cmFwcGVkTG9nZ2VyID0ge307XG4gIE9iamVjdC5kZWZpbmVQcm9wZXJ0eSh3cmFwcGVkTG9nZ2VyLCAnbGV2ZWwnLCB7XG4gICAgZ2V0OiBmdW5jdGlvbiAoKSB7IHJldHVybiBsb2dnZXIubGV2ZWw7IH0sXG4gICAgc2V0OiBmdW5jdGlvbiAobmV3VmFsdWUpIHsgbG9nZ2VyLmxldmVsID0gbmV3VmFsdWU7IH0sXG4gICAgZW51bWVyYWJsZTogdHJ1ZSxcbiAgICBjb25maWd1cmFibGU6IHRydWVcbiAgfSk7XG4gIGZvcihsZXQgayBvZiBucG1MZXZlbHMpIHtcbiAgICB3cmFwcGVkTG9nZ2VyW2tdID0gbG9nZ2VyW2tdLmJpbmQobG9nZ2VyLCBwcmVmaXgpO1xuICB9XG4gIHdyYXBwZWRMb2dnZXIuZXJyb3JBbmRUaHJvdyA9IGZ1bmN0aW9uIChlcnIpIHtcbiAgICBpZiAoIShlcnIgaW5zdGFuY2VvZiBFcnJvcikpIHtcbiAgICAgIGVyciA9IG5ldyBFcnJvcihlcnIpO1xuICAgIH1cbiAgICB0aGlzLmVycm9yKGVycik7XG4gICAgdGhyb3cgZXJyO1xuICB9O1xuICB3cmFwcGVkTG9nZ2VyLmxldmVsID0gJ3ZlcmJvc2UnO1xuICByZXR1cm4gd3JhcHBlZExvZ2dlcjtcbn1cblxuY29uc3QgbG9nID0gZ2V0TG9nZ2VyKCk7XG5cbmV4cG9ydCBkZWZhdWx0IGxvZztcbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,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Q0FBQzs7cUJBRVQsR0FBRyIsImZpbGUiOiJsaWIvbG9nZ2VyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IG5wbWxvZyBmcm9tICducG1sb2cnO1xuXG5jb25zdCBucG1MZXZlbHMgPSBbJ3NpbGx5JywgJ3ZlcmJvc2UnLCAnZGVidWcnLCAnaW5mbycsICdodHRwJywgJ3dhcm4nLCAnZXJyb3InXTtcbmxldCBtb2NrTG9nID0ge307XG5mb3IgKGxldCBsIG9mIG5wbUxldmVscykge1xuICBtb2NrTG9nW2xdID0gKCkgPT4ge307XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBwYXRjaExvZ2dlcihsb2dnZXIpIHtcbiAgaWYgKCFsb2dnZXIuZGVidWcpIHtcbiAgICBsb2dnZXIuYWRkTGV2ZWwoJ2RlYnVnJywgMTAwMCwgeyBmZzogJ2JsdWUnLCBiZzogJ2JsYWNrJyB9LCAnZGJ1ZycpO1xuICB9XG59XG5cbmZ1bmN0aW9uIF9nZXRMb2dnZXIgKCkge1xuICBjb25zdCB0ZXN0aW5nTW9kZSA9IHBhcnNlSW50KHByb2Nlc3MuZW52Ll9URVNUSU5HLCAxMCkgPT09IDE7XG4gIGNvbnN0IGZvcmNlTG9nTW9kZSA9IHBhcnNlSW50KHByb2Nlc3MuZW52Ll9GT1JDRV9MT0dTLCAxMCkgPT09IDE7XG4gIGNvbnN0IHVzaW5nR2xvYmFsTG9nID0gISFnbG9iYWwuX2dsb2JhbF9ucG1sb2c7XG4gIGxldCBsb2dnZXIgPSAodGVzdGluZ01vZGUgJiYgIWZvcmNlTG9nTW9kZSkgPyBtb2NrTG9nIDpcbiAgICAoZ2xvYmFsLl9nbG9iYWxfbnBtbG9nIHx8IG5wbWxvZyk7XG4gIHBhdGNoTG9nZ2VyKGxvZ2dlcik7XG4gIHJldHVybiBbbG9nZ2VyLCB1c2luZ0dsb2JhbExvZ107XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBnZXRMb2dnZXIocHJlZml4ID0gbnVsbCkge1xuICBsZXQgW2xvZ2dlciwgdXNpbmdHbG9iYWxMb2ddID0gX2dldExvZ2dlcigpO1xuICBsZXQgd3JhcHBlZExvZ2dlciA9IHt9O1xuICBPYmplY3QuZGVmaW5lUHJvcGVydHkod3JhcHBlZExvZ2dlciwgJ2xldmVsJywge1xuICAgIGdldDogZnVuY3Rpb24gKCkgeyByZXR1cm4gbG9nZ2VyLmxldmVsOyB9LFxuICAgIHNldDogZnVuY3Rpb24gKG5ld1ZhbHVlKSB7IGxvZ2dlci5sZXZlbCA9IG5ld1ZhbHVlOyB9LFxuICAgIGVudW1lcmFibGU6IHRydWUsXG4gICAgY29uZmlndXJhYmxlOiB0cnVlXG4gIH0pO1xuICBmb3IobGV0IGsgb2YgbnBtTGV2ZWxzKSB7XG4gICAgd3JhcHBlZExvZ2dlcltrXSA9IGxvZ2dlcltrXS5iaW5kKGxvZ2dlciwgcHJlZml4KTtcbiAgfVxuICB3cmFwcGVkTG9nZ2VyLmVycm9yQW5kVGhyb3cgPSBmdW5jdGlvbiAoZXJyKSB7XG4gICAgaWYgKCEoZXJyIGluc3RhbmNlb2YgRXJyb3IpKSB7XG4gICAgICBlcnIgPSBuZXcgRXJyb3IoZXJyKTtcbiAgICB9XG4gICAgdGhpcy5lcnJvcihlcnIpO1xuICAgIHRocm93IGVycjtcbiAgfTtcbiAgaWYgKCF1c2luZ0dsb2JhbExvZykge1xuICAgIC8vIGlmIHdlJ3JlIG5vdCB1c2luZyBhIGdsb2JhbCBsb2cgc3BlY2lmaWVkIGZyb20gc29tZSB0b3AtbGV2ZWwgcGFja2FnZSxcbiAgICAvLyBzZXQgdGhlIGxvZyBsZXZlbCB0byBhIGRlZmF1bHQgb2YgdmVyYm9zZS4gT3RoZXJ3aXNlLCBsZXQgdGhlIHRvcC1sZXZlbFxuICAgIC8vIHBhY2thZ2Ugc2V0IHRoZSBsb2cgbGV2ZWxcbiAgICB3cmFwcGVkTG9nZ2VyLmxldmVsID0gJ3ZlcmJvc2UnO1xuICB9XG4gIHJldHVybiB3cmFwcGVkTG9nZ2VyO1xufVxuXG5jb25zdCBsb2cgPSBnZXRMb2dnZXIoKTtcblxuZXhwb3J0IGRlZmF1bHQgbG9nO1xuIl19

lib/logger.js

@@ -18,10 +18,11 @@ import npmlog from 'npmlog';
   const forceLogMode = parseInt(process.env._FORCE_LOGS, 10) === 1;
+  const usingGlobalLog = !!global._global_npmlog;
   let logger = (testingMode && !forceLogMode) ? mockLog :
     (global._global_npmlog || npmlog);
   patchLogger(logger);
-  return logger;
+  return [logger, usingGlobalLog];
 }
 
 export function getLogger(prefix = null) {
-  let logger = _getLogger();
+  let [logger, usingGlobalLog] = _getLogger();
   let wrappedLogger = {};
@@ -44,3 +45,8 @@ Object.defineProperty(wrappedLogger, 'level', {
   };
-  wrappedLogger.level = 'verbose';
+  if (!usingGlobalLog) {
+    // if we're not using a global log specified from some top-level package,
+    // set the log level to a default of verbose. Otherwise, let the top-level
+    // package set the log level
+    wrappedLogger.level = 'verbose';
+  }
   return wrappedLogger;
@@ -47,0 +53,0 @@ }

package.json

@@ -7,3 +7,3 @@ {
   ],
-  "version": "1.1.4",
+  "version": "1.1.5",
   "author": "appium",
@@ -10,0 +10,0 @@ "license": "Apache-2.0",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

45988

increased by3.09%

Lines of code

593

increased by2.77%

No dependency changes