loggj 1.0.10 → 2.0.0

package/README.md

@@ -1,7 +1,22 @@
 # loggj
 
 This is a fork of [rufus](https://github.com/btd/rufus). Added file rotation handler with multiprocess/node cluster support. Rotation by size or time is not exact for better performance.
-ES6 support required, tested with Node 4.
+Requires Node.js >= 22.12. Tested with Node 22, 24, 26.
+
+## Upgrading from 1.x
+
+2.0.0 brings support of Node 23+ and removes most of dependencies. Breaking changes:
+
+- Node.js >= 22.12 is required.
+- `chalk` is not a dependency anymore, ConsoleHandler colorizes messages with built-in `util.styleText`.
+  Colored output is the same, but loggj no longer sets `chalk.enabled = true` on a shared `chalk@1` instance,
+  so if your app relied on that side effect, enable colors in chalk by yourself.
+- An object passed to a log method as last argument which is `instanceof Error` but not a native error
+  (e.g. `Object.create(Error.prototype)`) goes to `record.err` again on every Node version.
+  In 1.0.11 on Node 23+ such objects stayed in `record.args`.
+
+Custom handlers written with `loggj.Handler.call(this, options)` and `util.inherits` work as before.
+See [CHANGELOG](CHANGELOG.md) for the full list of changes.
 
 ## Getting started
 
@@ -267,7 +282,7 @@ The power of logger hierarchies can seen more when using [loggj.config](#config)
 
 ### Logging Exceptions
 
-Any time you pass an exception (an `Error`!) to a log method as last argument, the stack
+Any time you pass an exception (an `Error` or anything that is `instanceof Error`) to a log method as last argument, the stack
 will be included in the output (if in format presented `%err` or `%error`).
 
 ```js
@@ -315,7 +330,7 @@ Just like Loggers, if a message's level is not equal to or greater than the Hand
 new 'console'(options);
 ```
 
-The Console handler outputs messages to the `stdio` or `stderr` (if level >= `WARN`), just like `console.log()` would. By default it colorize messages.
+The Console handler outputs messages to the `stdio` or `stderr` (if level >= `WARN`), just like `console.log()` would. By default it colorize messages (with built-in `util.styleText`, even if output is not a TTY or `NO_COLOR` is set), pass `colorize: false` to disable it.
 
 ### StreamHandler
 

package/lib/config.js

@@ -71,8 +71,9 @@ function configureLogger(name, loggerOptions, options) {
   }
   if (loggerOptions.filters) {
     loggerOptions.filters.forEach(function eachHandler(fname) {
-      if(!options[fname]) throw new Error('There is no filter with name: ' + fname);
-      logger.addFilter(options.filters[fname]);
+      var filter = options.filters && options.filters[fname];
+      if(!filter) throw new Error('There is no filter with name: ' + fname);
+      logger.addFilter(filter);
     });
   }
 

package/lib/console.js

@@ -5,15 +5,34 @@
 var path = require('path');
 var util = require('util');
 
-var stack = require('stack-trace');
-
 var rufus = require('./');
 var ORIGINAL_METHODS = {};
 
 var root;
 
+/**
+ * Returns V8 call sites starting from the caller of this function
+ * @returns {Array} array of CallSite
+ */
+function getCallSites() {
+  var oldLimit = Error.stackTraceLimit;
+  var oldPrepare = Error.prepareStackTrace;
+  Error.stackTraceLimit = Infinity;
+  Error.prepareStackTrace = function(obj, callSites) {
+    return callSites;
+  };
+
+  var obj = {};
+  Error.captureStackTrace(obj, getCallSites);
+  var callSites = obj.stack;
+
+  Error.prepareStackTrace = oldPrepare;
+  Error.stackTraceLimit = oldLimit;
+  return callSites;
+}
+
 function getLogger() {
-  var trace = stack.get();
+  var trace = getCallSites();
 
   var filename;
   for (var i = 0, len = trace.length; i < len; i++) {
@@ -42,7 +61,7 @@ function replaceConsoleMethodWith(consoleMethod, logMethod) {
 
 function overrideConsole(options) {
   options = options || {};
-  root = options.root || path.dirname(stack.get()[1].getFileName());
+  root = options.root || path.dirname(getCallSites()[1].getFileName());
 
   console.log(root);
 

package/lib/filter.js

@@ -19,7 +19,7 @@ function Filter(filter) {
         return record.name[filter.length] === '.';
       }
     };
-  } else if (util.isRegExp(filter)) {
+  } else if (util.types.isRegExp(filter)) {
     return function(record) {
       return filter.test(record.message);
     };

package/lib/handlers/console.js

@@ -3,21 +3,25 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 var util = require('util');
-var chalk = require('chalk');
 
 var Handler = require('./handler');
 var StreamHandler = require('./stream');
 var LEVELS = require('../levels');
 
-chalk.enabled = true;
+// always colorize, even if stream is not a TTY or NO_COLOR is set
+function color(name) {
+  return function(str) {
+    return str && util.styleText(name, str, { validateStream: false });
+  };
+}
 
 var COLORS = {
-  'VERBOSE': chalk.cyan,
-  'DEBUG': chalk.blue,
-  'INFO': chalk.green,
-  'WARN': chalk.yellow,
-  'ERROR': chalk.red,
-  'CRITICAL': chalk.magenta
+  'VERBOSE': color('cyan'),
+  'DEBUG': color('blue'),
+  'INFO': color('green'),
+  'WARN': color('yellow'),
+  'ERROR': color('red'),
+  'CRITICAL': color('magenta')
 };
 
 for(var c in COLORS){

package/lib/handlers/rotating.js

@@ -299,7 +299,23 @@ RotatingFileHandler.prototype.shouldRotate = function (force) {
     });
 };
 
-RotatingFileHandler.prototype._getData = function () {
+// Resolves when stream opened its file or failed to do it (stream error is not handled here)
+function whenOpened(stream) {
+    return new Promise((resolve) => {
+        if (!stream.pending) {
+            return resolve();
+        }
+        let done = () => {
+            stream.removeListener('ready', done);
+            stream.removeListener('close', done);
+            resolve();
+        };
+        stream.once('ready', done);
+        stream.once('close', done);
+    });
+}
+
+RotatingFileHandler.prototype._getData = function (retried) {
     let that = this;
     let size;
     debug('Get file stat data');
@@ -326,9 +342,9 @@ RotatingFileHandler.prototype._getData = function () {
         that._prevSize = stat.size;
         return Promise.resolve([stat.size]);
     }).catch((err) => {
-        if (err.code == 'ENOENT') {
+        if (err.code == 'ENOENT' && !retried) {
             debug('No file, reopening..');
-            return that.reopen().then(that._getData());
+            return that.reopen().then(() => whenOpened(that._stream)).then(() => that._getData(true));
         } else {
             error('_getData', err);
             return that.reopen();

package/lib/logger.js

@@ -166,8 +166,9 @@ var proto = {
    */
   makeRecord: function makeRecord(name, level, msg, args) {
     var err;
-    if(util.isError(args[args.length - 1])) {
-      err = args[args.length - 1];
+    var last = args[args.length - 1];
+    if(util.types.isNativeError(last) || last instanceof Error) {
+      err = last;
       args.length = args.length - 1;
     }
 

package/package.json

@@ -1,19 +1,20 @@
 {
   "name": "loggj",
-  "version": "1.0.10",
+  "version": "2.0.0",
   "dependencies": {
-    "chalk": "^1.1.1",
-    "lockfile": "^1.0.1",
-    "stack-trace": "0.0.9"
-  },
-  "devDependencies": {
-    "mocha": "^10.2.0",
-    "sinon": "^1.17.3"
+    "lockfile": "^1.0.4"
   },
   "description": "Fast hierarchical text logger",
   "main": "./lib/index.js",
+  "files": [
+    "lib"
+  ],
+  "engines": {
+    "node": ">=22.12"
+  },
   "scripts": {
-    "test": "node_modules/.bin/mocha test --recursive"
+    "test": "node --test test/*.js",
+    "coverage": "node --test --experimental-test-coverage --test-coverage-include='lib/**' test/*.js"
   },
   "bugs": "https://github.com/glintik/loggj/issues",
   "repository": {

package/CHANGELOG.md

@@ -1,69 +0,0 @@
-# rufus ChangeLog
-
-## 0.5.7 - 2014-12-18
-
- - Fix console handler and how used levels
-
-## 0.5.6 - 2014-02-03
-
- - Bug in rotating handler
- - Stable and define log remover
-
-## 0.5.5 - 2014-01-30
-
- - Typo in file handler .reopen
-
-## 0.5.4 - 2014-01-30
-
- - Make rotating handler work now both with size based and time based rotations.
-
-## 0.5.3 - 2014-01-28
-
- - Some fixes for formats
-
-## 0.5.2 - 2014-01-27
-
- - Time based log rotation
-
-## 0.5.1 - 2014-01-25
-
-- Fix last tests
-- Small cleanup for file handler
-
-## 0.5.0 - 2013-11-13
-
-- General cleanup
-- Remove timeout for handlers
-- Improve perfomance
-- Use util.format instead of own printf
-- More accurate console replacement
-
-## v0.3.0 - 2013-10-24
-
-- added intel.handlers.Rotating
-- added ignore options to intel.console()
-- added chalk.enabled when colorize is used
-- added padding and truncation to printf
-- added Logger#handleExceptions to catch uncaught exceptions
-- added stack traces when an exception is logged
-- fork intel to support it myself
-- changed Promises from Q to bluebird, significantly faster
-- fixed Console handler from using accepting format options
-- make format and dates compiled. Perfomance stability with any format
-
-# inter Changelog
-
-## v0.2.0 - 2013-10-04
-
-- added Filters for Handlers and Loggers
-- added Handler timeout option
-- added pid to LogRecord
-- added configuration using JSON
-- changed Promises to LazyPromises
-- changed printf to faster, smaller printf
-- changed internal forEach to faster while loops
-- removed node v0.6 support (it didn't work anyways)
-
-## v0.1.0 - 2013-09-30
-
-- Initial release.

package/Makefile

@@ -1,16 +0,0 @@
-REPORTER = spec
-
-test:
-	@NODE_ENV=test ./node_modules/.bin/mocha \
-	--check-leaks \
-	--reporter $(REPORTER)
-
-test-cov:
-	@NODE_ENV=test ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- \
-	--check-leaks \
-	--reporter $(REPORTER)
-
-jshint:
-	./node_modules/.bin/jshint --show-non-errors lib test
-
-.PHONY: test test-cov

package/TODO.md

@@ -1,13 +0,0 @@
-## What need to fix
-
-1. Correctly remove rotated files
-2. Create folders for file handler
-3. Move files not rename in rotating handler
-
-## What need to add
-
-1. socket handler (consist from 4 parts: server which push logs from connected clients and client which push logs to server which connected)
-2. smtp handler (without grouping and filtering useless)
-3. json formatter (why not just replace bunyan if i can)
-
-Both should collect messages in buffer maybe with support of grouping by specific thing

package/benchmark/logging.js

@@ -1,74 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const Console = require('console').Console;
-const EE = require('events').EventEmitter;
-
-const winston = require('winston');
-const rufus = require('../');
-const intel = require('intel');
-const bunyan = require('bunyan');
-const log4js = require('log4js').getLogger();
-
-var stdout = new EE();
-stdout.write = function (out, encoding, cb) {
-  if (typeof encoding === 'function') {
-    cb = encoding;
-    encoding = null;
-  }
-  cb && cb();
-  return true;
-};
-
-var _console = new Console(stdout, stdout);
-
-rufus.addHandler(new rufus.handlers.Stream({ stream: stdout, formatter: new rufus.Formatter('[%date] %logger:: %message') }));
-intel.addHandler(new intel.handlers.Stream({ stream: stdout, formatter: new intel.Formatter('[%(date)s] %(name)s:: %(message)s') }));
-
-winston.add(winston.transports.File, { stream: stdout, timestamp: true });
-winston.remove(winston.transports.Console);
-
-var log = bunyan.createLogger({name: 'lr', level: 'debug'});
-
-process.stdout.write = function(msg, enc, callback) {
-  if(typeof enc === 'function' && !callback) callback = enc;
-
-  callback && callback();
-  return true;
-}
-
-var Benchmark = require('benchmark');
-
-var suite = new Benchmark.Suite('logging.info()');
-
-suite
-  .add('console.info', function() {
-    _console.info('asdf');
-  })
-  .add('rufus.info', function() {
-    rufus.info('asdf');
-  })
-  .add('winston.info', function() {
-    winston.info('asdf');
-  })
-  .add('intel.info', function() {
-    intel.info('asdf');
-  })
-  .add('bunyan.info', function() {
-    log.info('asdf');
-  })
-  .add('log4js.info', function() {
-    log4js.info('asdf');
-  })
-
-suite
-// add listeners
-  .on('cycle', function (event) {
-    console.warn(String(event.target));
-  })
-  .on('complete', function () {
-    console.warn('Fastest is ' + this.filter('fastest').pluck('name'));
-  })
-// run async
-  .run({ 'async': true });

package/test/config.js

@@ -1,179 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var assert = require('assert');
-var os = require('os');
-var path = require('path');
-var util = require('util');
-
-var rufus = require('../');
-
-var NOW = Date.now();
-var counter = 1;
-function tmp() {
-  return path.join(os.tmpdir(),
-    'rufus-' + NOW + '-' + process.pid + '-' + (counter++));
-}
-
-function spy() {
-  var args = [];
-  var fn = function () {
-    args.push(arguments);
-  };
-  fn.getCallCount = function () {
-    return args.length;
-  };
-  fn.getLastArgs = function () {
-    return args[args.length - 1];
-  };
-  return fn;
-}
-
-function SpyHandler() {
-  rufus.Handler.apply(this, arguments);
-  this.spy = spy();
-}
-util.inherits(SpyHandler, rufus.Handler);
-SpyHandler.prototype.emit = function spyEmit(record, callback) {
-  this.spy.apply(this, arguments);
-  callback();
-};
-
-var oldBasic;
-var oldLevel;
-describe('basicConfig', function () {
-  beforeEach(function () {
-    oldBasic = rufus.basicConfig;
-    oldLevel = rufus._level;
-
-    rufus._handlers = [];
-  });
-
-  afterEach(function () {
-    rufus.basicConfig = oldBasic;
-    rufus._level = oldLevel;
-  });
-
-  it('root logger calls basicConfig', function (done) {
-    var val;
-    var stream = {
-      write: function (out, cb) {
-        val = out;
-        cb();
-      }
-    };
-
-    rufus.basicConfig = function () {
-      oldBasic({ stream: stream, format: '%message' });
-    };
-
-    rufus.info('danger').then(function () {
-      assert.strictEqual(val, 'danger');
-      assert.strictEqual(rufus._level, oldLevel);
-      done();
-    });
-  });
-
-  it('only works once', function () {
-    rufus.basicConfig();
-    assert.strictEqual(rufus._level, oldLevel);
-
-    rufus.basicConfig({ level: 'critical' });
-    assert.strictEqual(rufus._handlers.length, 1);
-    assert.strictEqual(rufus._level, oldLevel);
-  });
-
-  it('works with file option', function () {
-    var name = tmp();
-    rufus.basicConfig({ file: name });
-    assert.strictEqual(rufus._handlers.length, 1);
-    assert.strictEqual(rufus._handlers[0]._file, name);
-  });
-
-
-  it('works with level', function () {
-    rufus.basicConfig({ level: 'error' });
-    assert.strictEqual(rufus._level, rufus.ERROR);
-  });
-
-  it('works with format', function () {
-    rufus.basicConfig({ format: '%msg'});
-    assert.strictEqual(rufus._handlers[0]._formatter._format, '%msg');
-  });
-
-  afterEach(function () {
-    rufus.basicConfig = oldBasic;
-    rufus.setLevel(oldLevel);
-    rufus._handlers = [];
-  });
-
-});
-
-describe('config', function () {
-  it('should be able to configure logging', function (done) {
-    rufus.config({
-      formatters: {
-        'basic': '%message',
-        'foo': 'foo! %level: %message'
-      },
-      filters: {
-        'user': /\buser\b/g
-      },
-      handlers: {
-        'null': {
-          'class': SpyHandler,
-          'formatter': 'foo',
-          'filters': ['user']
-        }
-      },
-      loggers: {
-        'qqq.zzz': {
-          'level': 'INFO',
-          'propagate': false,
-          'handlers': ['null']
-        },
-        'qqq.ww.zzz': {
-          'level': 'INFO',
-          'propagate': false,
-          'handleExceptions': true,
-          'exitOnError': false,
-          'handlers': ['null']
-        }
-      }
-    });
-
-    var excepts = rufus.getLogger('qqq.ww.zzz');
-    assert(excepts._uncaughtException);
-    assert(!excepts._exitOnError);
-
-    var log = rufus.getLogger('qqq.zzz');
-    var handler = log._handlers[0];
-    assert.strictEqual(log._handlers.length, 1);
-    assert(!log.propagate);
-
-    var msg = handler.format({ message: 'hi', args: [ 'hi' ], levelname: 'BAR'});
-    assert.strictEqual(msg, 'foo! BAR: hi');
-
-    log.debug('user').then(function () {
-      assert.strictEqual(handler.spy.getCallCount(), 0);
-
-      return log.info('user foo');
-    }).then(function () {
-        assert.strictEqual(handler.spy.getCallCount(), 1);
-        assert.strictEqual(handler.spy.getLastArgs()[0].message, 'user foo');
-
-        return log.info('ignore me');
-      }).then(function () {
-        assert.strictEqual(handler.spy.getCallCount(), 1);
-        done();
-      });
-  });
-
-  it('should be able to config with just JSON', function () {
-    rufus.config(require('./util/config.json'));
-
-    var log = rufus.getLogger('test.config.json');
-    assert.strictEqual(log._handlers.length, 2);
-  });
-});

package/test/console.js

@@ -1,54 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/*global describe: true, it:true, before: true, after: true*/
-
-var assert = require('assert');
-
-var rufus = require('../');
-var consoleUtil = require('./util/console');
-
-var spy = new rufus.handlers.Null();
-spy.handle = function(record) {
-  this._lastRecord = record;
-  return rufus.handlers.Null.prototype.handle.call(this, record);
-};
-
-var prevLog;
-var lastMock;
-function mockLog() {
-  lastMock = arguments;
-}
-
-describe('Console replacement', function() {
-  before(function() {
-    rufus.addHandler(spy);
-    prevLog = console.log;
-    console.log = mockLog;
-    // not passing root means this file becomes root.
-    // which means dirname.basename, or test.console
-    rufus.console();
-  });
-
-  after(function() {
-    rufus.console.restore();
-    assert.strictEqual(console.log, mockLog);
-    console.log = prevLog;
-    rufus._handlers = [];
-  });
-
-
-  it('can inject into global scope', function() {
-    console.warn('test');
-    assert(spy._lastRecord);
-    assert.strictEqual(spy._lastRecord.message, 'test');
-  });
-
-  it('can generate a name', function() {
-    console.log('foo');
-    assert.strictEqual(spy._lastRecord.name, 'test.console');
-
-    consoleUtil('bar');
-    assert.strictEqual(spy._lastRecord.name, 'test.util.console');
-  });
-});

package/test/filter.js

@@ -1,33 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/*global describe: true, it:true*/
-
-var assert = require('assert');
-
-var rufus = require('../');
-
-describe('Filters', function() {
-  it('should accept regexp', function() {// regex filter check message
-    var f = rufus.makeFilter(/^foo/);
-
-    assert.ok(!f({ message: 'not foobar' }));
-    assert.ok(f({ message: 'foobar' }));
-  });
-
-  it('should accept string', function() {// string filter check name
-    var f = rufus.makeFilter('foo.bar');
-
-    assert(f({
-      name: 'foo.bar'
-    }));
-
-    assert(f({
-      name: 'foo.bar.baz'
-    }));
-
-    assert(!f({
-      name: 'food.bar'
-    }));
-  });
-});

package/test/formatter.js

@@ -1,89 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/*global describe: true, it:true*/
-
-var assert = require('assert');
-
-var EOL = require('os').EOL;
-
-var rufus = require('../');
-
-describe('Formatter', function() {
-  it('should accept a format string', function() {
-    var formatter = new rufus.Formatter('%level');
-    assert.strictEqual(formatter._format, '%level');
-  });
-
-  it('should accept options', function() {
-    var formatter = new rufus.Formatter({
-      format: '%level'
-    });
-
-    assert.strictEqual(formatter._format, '%level');
-  });
-
-  it('should output an Error stack', function() {
-    var formatter = new rufus.Formatter('%logger: %message%n%err');
-    var e = new Error('boom');
-    var msg = 'oh noes:';
-    var name = 'foo';
-
-    //similar produced with Logger.makeRecord
-    var record = {
-      name: name,
-      message: msg,
-      args: [msg],
-      err: e
-    };
-
-    assert.strictEqual(formatter.format(record), name + ': ' + msg + EOL + e.stack + EOL);
-  });
-
-  it('should allow to set date format', function() {
-    var formatter = new rufus.Formatter({
-      format: '%date{%Y-%m}'
-    });
-
-    var d = new Date();
-    var record = {
-      timestamp: d
-    };
-
-    function pad(val) {
-      if (val > 9) {
-        return val;
-      }
-      return '0' + val;
-    }
-    var expected = d.getFullYear() + '-' + pad(d.getMonth() + 1);
-    assert.strictEqual(formatter.format(record), expected);
-  });
-
-  it('should format as json', function() {
-    var formatter = new rufus.Formatter({
-      format: 'json'
-    });
-
-    var e = new Error('boom');
-
-    let message = 'some message';
-    var record = {
-      timestamp: new Date(),
-      levelname: 'INFO',
-      name: 'some name',
-      pid: 123,
-      message,
-      args: [message, 1, 'abc'],
-      err: e,
-    };
-    //      ['timestamp', 'levelname', 'name', 'pid', 'message'].forEach(k => {
-    let recordExpected = Object.assign({}, record, {
-      err: e.stack,
-      message: `${message} 1 abc`
-    });
-    delete recordExpected.args;
-
-    assert.strictEqual(formatter.format(record), JSON.stringify(recordExpected) + EOL);
-  });
-});

package/test/handlers.js

@@ -1,335 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var assert = require('assert');
-var EventEmitter = require('events').EventEmitter;
-var fs = require('fs');
-var os = require('os');
-var path = require('path');
-
-var rufus = require('../');
-
-var glob = require('../lib/utils/re-glob');
-
-var NOW = Date.now();
-var counter = 1;
-function tmp() {
-  return path.join(os.tmpdir(),
-    'rufus-' + NOW + '-' + process.pid + '-' + (counter++));
-}
-
-function rec(msg, level) {
-  return { message: msg, args: [msg], timestamp: new Date() };
-}
-
-function bytes(x) {
-  var b = new Buffer(x);
-  b[0] = '<'.charCodeAt(0);
-  b[b.length - 1] = '>'.charCodeAt(0);
-  b.fill('a', 1, b.length - 1);
-  return b.toString();
-}
-
-describe('Handler', function () {
-  describe('constructor', function () {
-    it('should accept options', function () {
-      var h = new rufus.Handler({ level: rufus.ERROR });
-      assert.strictEqual(h.level, rufus.ERROR);
-    });
-
-    it('should accept a level', function () {
-      var h = new rufus.Handler(rufus.WARN);
-      assert.strictEqual(h.level, rufus.WARN);
-    });
-  });
-
-  describe('handle', function () {
-    it('requires emit to accept a callback argument', function () {
-      var h = new rufus.Handler();
-      h.emit = function () {
-      };
-
-      assert.throws(h.handle.bind(h), function (err) {
-        return err.message === 'Handler.emit requires a callback argument';
-      });
-
-      h = new rufus.Handler();
-      h.emit = function (record, callback) {
-        record = callback;
-      };
-      assert.doesNotThrow(h.handle.bind(h));
-    });
-
-    it('should use filters on record', function (done) {
-      var h = new rufus.Handler();
-      var lastRecord;
-      h.emit = function (record, callback) {
-        lastRecord = record;
-        callback();
-      };
-
-      h.addFilter(rufus.makeFilter('foo'));
-      h.handle({ name: 'foo' }).then(function () {
-        assert.strictEqual(lastRecord.name, 'foo');
-
-        return h.handle({ name: 'foobar' });
-      }).then(function () {
-          assert.notEqual(lastRecord.name, 'foobar');
-          done();
-        });
-    });
-  });
-
-  describe('emit', function () {
-    it('must be overriden by subclasses', function () {
-      var h = new rufus.Handler();
-      assert.throws(h.emit);
-    });
-  });
-});
-
-describe('Stream', function () {
-  describe('constructor', function () {
-    it('should accept options', function () {
-      var stream = {};
-      var handler = new rufus.handlers.Stream({
-        level: rufus.INFO,
-        stream: stream
-      });
-
-      assert.strictEqual(handler.level, rufus.INFO);
-      assert.strictEqual(handler._stream, stream);
-    });
-
-    it('should accept just a stream', function () {
-      var stream = {};
-      var handler = new rufus.handlers.Stream(stream);
-
-      assert.strictEqual(handler.level, rufus.NOTSET);
-      assert.strictEqual(handler._stream, stream);
-    });
-  });
-
-  describe('emit', function () {
-    it('should write message to stream', function (done) {
-      var out;
-      var stream = {
-        write: function (msg, fn) {
-          out = msg;
-          fn();
-        }
-      };
-
-      var handler = new rufus.handlers.Stream({
-        stream: stream,
-        formatter: new rufus.Formatter('%message%n')
-      });
-      handler.handle({ message: 'foo', args: ['foo'] }).then(function () {
-        assert.strictEqual(out, 'foo\n');
-        done();
-      });
-    });
-
-    it('should wait for flush on slow streams', function (done) {
-      var out;
-      var stream = new EventEmitter();
-      stream.write = function write(data, fn) {
-        setTimeout(function () {
-          out = data;
-          fn();
-        }, 1);
-      };
-      var handler = new rufus.handlers.Stream({
-        stream: stream,
-        formatter: new rufus.Formatter('%message%n')
-      });
-      handler.handle({ message: 'secret', args: ['secret'] }).then(function () {
-        assert.strictEqual(out, 'secret\n');
-        done();
-      });
-    });
-  });
-});
-
-describe('File', function () {
-  describe('constructor', function () {
-    it('should accept options', function () {
-      var filename = tmp();
-      var handler = new rufus.handlers.File({
-        level: rufus.WARN,
-        file: filename
-      });
-
-      assert.strictEqual(handler.level, rufus.WARN);
-      assert.strictEqual(handler._file, filename);
-    });
-
-    it('should accept a filename', function () {
-      var filename = tmp();
-      var handler = new rufus.handlers.File(filename);
-
-      assert.strictEqual(handler._file, filename);
-    });
-  });
-
-  describe('handle', function () {
-    it('should write to the file', function (done) {
-      var filename = tmp();
-      var handler = new rufus.handlers.File({
-        file: filename,
-        formatter: new rufus.Formatter('%message%n')
-      });
-      handler.handle({ message: 'recon', args: ['recon'] }).then(function () {
-        fs.readFile(filename, function (err, contents) {
-          assert.ifError(err);
-          assert.equal(contents.toString(), 'recon\n');
-          done();
-        });
-      });
-    });
-  });
-});
-
-describe('Console', function () {
-  describe('constructor', function () {
-    it('should use stdout and stderr', function () {
-      var h = new rufus.handlers.Console();
-      assert.strictEqual(h._out._stream, process.stdout);
-      assert.strictEqual(h._err._stream, process.stderr);
-    });
-  });
-
-  describe('handle', function () {
-    it('should send low priority messages to stdout', function (done) {
-      var h = new rufus.handlers.Console({
-        formatter: new rufus.Formatter('%message%n'),
-        colorize: false
-      });
-      var val;
-      h._out._stream = {
-        write: function (out, callback) {
-          val = out;
-          callback();
-          return true;
-        }
-      };
-
-      h.handle({ level: rufus.INFO, message: 'oscar mike', args: ['oscar mike'] }).then(function () {
-        assert.strictEqual(val, 'oscar mike\n');
-        done();
-      });
-    });
-
-    it('should send warn and higher messages to stderr', function (done) {
-      var h = new rufus.handlers.Console({
-        formatter: new rufus.Formatter('%message%n'),
-        colorize: false
-      });
-      var val;
-      h._err._stream = {
-        write: function (out, callback) {
-          val = out;
-          callback();
-          return true;
-        }
-      };
-
-      h.handle({ level: rufus.WARN, message: 'mayday', args: ['mayday'] }).then(function () {
-        assert.strictEqual(val, 'mayday\n');
-      }).then(done);
-    });
-  });
-});
-
-/*describe('RotatingFileHandler', function () {
-  describe('handle', function () {
-    it('with maxSize should create new files', function (done) {
-      this.timeout(5000);
-
-      var filename = tmp();
-      var handler = new rufus.handlers.Rotating({
-        file: filename,
-        maxSize: 64,
-        formatter: new rufus.Formatter('%message%n')
-      });
-
-      assert.strictEqual(handler._file, filename);
-      handler.handle(rec(bytes(60)));
-      handler.handle(rec(bytes(50)));
-      handler.handle(rec(bytes(45))).then(function () {
-        assert.strictEqual(fs.statSync(filename).size, 46);
-        assert.strictEqual(fs.statSync(filename + '.1').size, 51);
-        assert.strictEqual(fs.statSync(filename + '.2').size, 61);
-      }).done(done);
-    });
-
-    it('with maxSize should create new files date rated', function (done) {
-      this.timeout(5000);
-
-      var filename = tmp();
-      var handler = new rufus.handlers.Rotating({
-        file: filename,
-        timeRate: 200,
-        maxFiles: 2,
-        formatter: new rufus.Formatter('%message%n')
-      });
-
-      var times = 0;
-      var interval = setInterval(function() {
-        handler.handle(rec(bytes(50)));
-        times += 1;
-        if(times > 3) {
-          clearInterval(interval);
-          handler.handle(rec(bytes(45))).then(function () {
-            //glob(handler._remover.filesFormat, function(err, matches) {
-            //  console.log(matches);
-            //});
-            //should be 2 files, but i have no idea how correctly test it +1 current
-            assert(true);
-          }).done(done);
-        }
-      }, 250);
-    });
-
-    it('with maxFiles should not create more than max', function (done) {
-      this.timeout(5000);
-
-      var filename = tmp();
-      var handler = new rufus.handlers.Rotating({
-        file: filename,
-        maxSize: 64,
-        maxFiles: 3,
-        formatter: new rufus.Formatter('%message%n')
-      });
-
-      handler.handle({ message: bytes(50), args: [bytes(50)] });
-      handler.handle({ message: bytes(55), args: [bytes(55)] });
-      handler.handle({ message: bytes(60), args: [bytes(60)] });
-      handler.handle({ message: bytes(45), args: [bytes(45)] }).then(function () {
-        assert.strictEqual(fs.statSync(filename).size, 46);
-        assert.strictEqual(fs.statSync(filename + '.1').size, 61);
-        assert.strictEqual(fs.statSync(filename + '.2').size, 56);
-        assert(!fs.existsSync(filename + '.3'));
-      }).done(done);
-    });
-
-    it('should continue to write after buffer is flushed', function (done) {
-      this.timeout(5000);
-
-      var filename = tmp();
-      var handler = new rufus.handlers.Rotating({
-        file: filename,
-        maxSize: 64,
-        formatter: new rufus.Formatter('%message%n')
-      });
-
-      handler.handle({ message: bytes(29), args: [bytes(29)] }).then(function () {
-        return handler.handle({ message: bytes(31), args: [bytes(31)] });
-      }).then(function () {
-          assert.strictEqual(fs.statSync(filename).size, 62);
-        }).done(done);
-    });
-  });
-});
-*/

package/test/logger.js

@@ -1,201 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/*global describe: true, it:true*/
-
-var assert = require('assert');
-var sinon = require('sinon');
-
-var rufus = require('../');
-var Logger = rufus.Logger;
-
-var __counter = 1;
-function unique() {
-  return "u-" + __counter++;
-}
-
-function spyHandler(level, callback) {
-  if(typeof level !== 'number') level = 0;
-
-  var stub = sinon.spy(callback);
-
-  return {
-    handle: stub,
-    level: level
-  };
-}
-
-describe('Logger', function() {
-  it('should return the same logger when created with the same name', function() {
-    var name = unique();
-
-    var logger1 = new Logger(name);
-    var logger2 = new Logger(name);
-
-    assert.strictEqual(logger1, logger2);
-  });
-
-  it('should allow add handlers and remove them', function() {
-    var logger = new Logger(unique());
-    var handler = new rufus.handlers.Null();
-
-    logger.addHandler(handler);
-    assert.strictEqual(logger.getHandlers().length, 1);
-
-    logger.removeHandler(handler);
-    assert.strictEqual(logger.getHandlers().length, 0);
-  });
-
-  it('should set by default for child logger log level of its direct parent', function() {
-    var parentName = unique();
-    var parent = new Logger(parentName);
-    parent.setLevel('error');
-
-    var childName = parentName + '.' + unique();
-    var child = new Logger(childName);
-
-    assert.strictEqual(child.getEffectiveLevel(), rufus.ERROR);
-  });
-
-  it('should make record', function() {
-    var name = unique();
-    var logger = new Logger(name);
-
-    var msg = 'foo';
-    var level = rufus.DEBUG;
-    var err = new Error();
-    var args = [ msg, err ];
-    var record = logger.makeRecord(name, 'DEBUG', msg, args.slice());
-
-    assert.strictEqual(record.name, name);
-    assert.strictEqual(record.level, level);
-    assert.strictEqual(record.message, msg);
-    assert.strictEqual(record.levelname, 'DEBUG');
-    assert.strictEqual(record.pid, process.pid);
-    assert.strictEqual(record.args.length, args.length - 1); //it is because last arg is Error
-    assert.strictEqual(record.args[0], msg);
-    assert.strictEqual(record.err, err);
-  });
-
-  /*it('should call its handlers', function() {
-    var logger = new Logger(unique());
-    logger.propagate = false;
-
-    var handler = spyHandler();
-    logger.addHandler(handler);
-
-    logger.log(rufus.INFO, 'foo');
-    assert.ok(handler.handle.called);
-
-    logger.info('foo');
-    assert.ok(handler.handle.calledTwice);
-  });*/
-
-  it('should call parent handlers when propagate is true', function() {
-    var parentName = unique();
-    var parent = new Logger(parentName);
-    parent.propagate = false; //stop there
-
-    var childName = parentName + '.' + unique();
-    var child = new Logger(childName);
-
-    var parentHandler = spyHandler();
-    var childHandler = spyHandler();
-
-    parent.addHandler(parentHandler);
-    child.addHandler(childHandler);
-
-    child.info('foo');
-
-    assert.ok(childHandler.handle.calledOnce);
-    assert.ok(parentHandler.handle.calledOnce);
-  });
-
-  it('should call handlers which level is more then record level', function() {
-    var logger = new Logger(unique());
-    logger.propagate = false;
-
-    var handlerError = spyHandler(rufus.ERROR);
-    var handlerTrace = spyHandler(rufus.TRACE);
-
-    logger.addHandler(handlerError).addHandler(handlerTrace);
-
-    logger.info('foo');
-
-    assert.ok(handlerTrace.handle.calledOnce);
-    assert.ok(!handlerError.handle.called);
-  });
-
-  it('should call handlers when record level more or eql logger level', function() {
-    var logger = new Logger(unique());
-    logger.propagate = false;
-    logger.setLevel(rufus.INFO);
-
-    var handler = spyHandler();
-    logger.addHandler(handler);
-
-    logger.info('foo');
-    logger.error('foo');
-    logger.trace('foo');
-
-    assert.ok(handler.handle.calledTwice);
-  });
-
-  it('should allow to filter log records', function() {
-    var logger = new Logger(unique());
-    logger.propagate = false;
-
-    var handler = spyHandler();
-    logger.addHandler(handler);
-
-    logger.addFilter(rufus.makeFilter(/^foo/));
-
-    // message not pass filter
-    logger.info('bar');
-    assert.ok(!handler.handle.called);
-
-    logger.info('fooooo');
-    assert.ok(handler.handle.calledOnce);
-  });
-
-  it('should return promise that rejects when one of handlers fail', function(done) {//TODO
-    var logger = new Logger(unique());
-    logger.propagate = false;
-
-    var h = new rufus.handlers.Null();
-    h.emit = function(record, callback) {
-      throw new Error('foo');
-    };
-
-    logger.addHandler(h);
-
-    logger.info('bar').then(null, function(err) {
-      assert.strictEqual(err.message, 'foo');
-    }).then(done);
-  });
-});
-
-module.exports = {
-  'Logger': {
-    'handleExceptions': {
-      'should catch uncaughtErrors': function(done) {
-        this.slow(300);
-
-        spawn(false, function(err, stdout, stderr) {
-          assert.strictEqual(stderr, 'root.ERROR - Uncaught exception handled');
-          done();
-        });
-      },
-      'should not exit if exitOnError is false': function(done) {
-        this.slow(300);
-
-        spawn(true, function(err, stdout, stderr) {
-          assert.strictEqual(stderr, 'root.ERROR - Uncaught exception handled');
-          assert.strictEqual(stdout, 'root.INFO - noexit');
-          done();
-        });
-      }
-    }
-  }
-};
-

package/test/util/config.json

@@ -1,21 +0,0 @@
-{
-  "formatters": {
-    "basic": "basic: %(message)s"
-  },
-  "filters": {},
-  "handlers": {
-    "empty": {
-      "class": "rufus/handlers/null"
-    },
-    "spy": {
-      "class": "./test/util/spyhandler"
-    }
-  },
-  "loggers": {
-    "test.config.json": {
-      "level": "INFO",
-      "propagate": false,
-      "handlers": ["empty", "spy"]
-    }
-  }
-}

package/test/util/console.js

@@ -1,7 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-module.exports = function(x) {
-  console.log(x);
-};

package/test/util/error.js

@@ -1,18 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const rufus = require('../../');
-rufus.addHandler(new rufus.handlers.Console({
-  formatter: new rufus.Formatter('%logger.%level - %message'),
-  colorize: false
-}));
-rufus.handleExceptions(process.argv.indexOf('--noexit') === -1);
-
-/*setTimeout(function() {
-  throw new Error('catch me if you can');
-}, 5);*/
-
-setTimeout(function() {
-  rufus.info('noexit');
-}, 225);

package/test/util/spyhandler.js

@@ -1,18 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const util = require('util');
-
-const rufus = require('../../');
-
-function Spy() {
-  rufus.Handler.apply(this, arguments);
-}
-util.inherits(Spy, rufus.Handler);
-
-Spy.prototype.emit = function(record, callback) {
-  callback();
-};
-
-module.exports = Spy;