Removed flagged logging remnents

senecajs · Aug 19, 2016 · 2581e26 · 2581e26
1 parent 0bb2cbf
commit 2581e26
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 183 deletions.
diff --git a/lib/legacy.js b/lib/legacy.js
@@ -1,11 +1,8 @@
 /* Copyright (c) 2010-2016 Richard Rodger and other contributors, MIT License */
 'use strict'
 
-var Fs = require('fs')
-
 var _ = require('lodash')
 var Eraro = require('eraro')
-var Jsonic = require('jsonic')
 var Common = require('./common')
 var Errors = require('./errors')
 
@@ -54,173 +51,3 @@ exports.fail = function make_legacy_fail (so) {
     return err
   }
 }
-
-
-// handlers and parse_command_line to be removed in Seneca 3.x
-
-var handlers = exports.loghandler = {}
-
-var start_time = Date.now()
-
-handlers.pretty = function () {
-  var args = arrayify(arguments)
-  if (_.isString(args[2])) {
-    args[2] = args[2].toUpperCase()
-  }
-
-  if (args[0].short$) {
-    args[0] = '' + (args[0].getTime() - start_time)
-    args[0] = '        '.substring(0, 8 - args[0].length) + args[0]
-  }
-
-  var argstrs = []
-  args.forEach(function (a) {
-    var pstr = (a === null) ? a
-        : typeof (a) === 'string' ? a
-        : _.isDate(a) ? (a.toISOString())
-        : _.isObject(a) ? Jsonic.stringify(a) : a
-
-    argstrs.push(pstr)
-  })
-
-  return argstrs
-}
-
-handlers.silent = function silent () {
-  // does nothing!
-}
-
-handlers.print = function print () {
-  var arr = handlers.pretty.apply(null, arrayify(arguments))
-  console.log([arr.slice(0, 3).join(' ')].concat(arr.slice(3)).join('\t'))
-}
-
-handlers.stream = function stream (outstream, opts) {
-  opts = opts || {}
-  return function () {
-    var args = arrayify(arguments)
-    outstream.write(opts.format === 'json'
-      ? JSON.stringify(args) + '\n'
-      : handlers.pretty.apply(null, args).join('\t') + '\n')
-  }
-}
-
-handlers.emitter = function emitter (outemitter) {
-  return function () {
-    var args = arrayify(arguments)
-    outemitter.emit('log', args)
-  }
-}
-
-handlers.file = function file (filepath, opts) {
-  opts = opts || {}
-  var ws = Fs.createWriteStream(filepath, {flags: opts.flags || 'a'})
-  return handlers.stream(ws, opts)
-}
-
-
-function parse_command_line (spec, logspec, flags) {
-  flags = flags || {}
-
-  var logmaps = logspec.map
-
-  if (flags.shortcut) {
-    if (spec === 'short' || spec.short === true) {
-      logspec.short = true
-      if (!logmaps.length) {
-        logmaps.push({ level: 'info+', handler: 'print' })
-      }
-    }
-
-    var shortentries = logging_shortcut(spec)
-
-    if (shortentries.length) {
-      shortentries.forEach(function (shortentry) {
-        logmaps.push(shortentry)
-      })
-      return
-    }
-  }
-
-  if (_.isArray(spec)) {
-    spec.forEach(function (specentry) {
-      parse_command_line(specentry, logspec)
-    })
-    return
-  }
-
-  // parse: level=,type=,plugin=,tag=,case=,handler=
-  // handler can be print,file:path
-
-  var keys = { level: 1, type: 1, plugin: 1, tag: 1, 'case': 1,
-    handler: 1, regex: 1, pin: 1, act: 1 }
-  var entry = {}
-  var parts = ('' + spec).split(',')
-  _.each(parts, function (part) {
-    var kvm = part.match(/^(.*?):(.*)$/)
-    var kv = kvm ? [kvm[1], kvm[2]] : ['']
-
-    if (kv[0].length) {
-      var key = kv[0]
-      if (key === 'handler') {
-        var handler = kv.slice(1).join(':')
-        var m
-        if (handler === 'print') {
-          entry[key] = handlers.print
-        }
-        else if ((m = /^file:(\/\/)?(.*)$/.exec(handler))) {
-          entry[key] = handlers.file(m[2])
-        }
-      }
-      else if (keys[key]) {
-        if (entry[key]) {
-          entry[key] += ',' + kv[1]
-        }
-        else {
-          entry[key] = kv[1]
-        }
-      }
-    }
-  })
-
-  if (_.keys(entry).length) {
-    // print by default
-    if (entry && !entry.handler) {
-      entry.handler = handlers.print
-    }
-
-    logmaps.push(entry)
-  }
-}
-
-exports.parse_command_line = parse_command_line
-
-
-function logging_shortcut (spec) {
-  if (spec && (spec.print === true ||
-    spec.all === true ||
-    spec === 'print' ||
-    spec === 'all')) {
-    return [{ level: 'all', handler: handlers.print }]
-  }
-  else if (spec &&
-    (spec.quiet ||
-    spec === 'quiet' ||
-    spec.silent ||
-    spec === 'silent')) {
-    return []
-  }
-  else if (spec === 'test') {
-    return [{ level: 'error+', handler: handlers.print }]
-  }
-  else if (spec === 'standard') {
-    return [{ level: 'info+', handler: handlers.print }]
-  }
-  else if (_.isString(spec)) {
-    var logspec = {map: []}
-    parse_command_line(spec, logspec, {shortcut: false})
-    return logspec.map
-  }
-  else return []
-}
-
diff --git a/lib/optioner.js b/lib/optioner.js
@@ -48,14 +48,6 @@ module.exports = function (callmodule, defaults) {
 
   // Runtime options
 
-  if (process.env.SENECA_LOG) {
-    sourcemap.env.log = sourcemap.env.log || {}
-    sourcemap.env.log.map = sourcemap.env.log.map || []
-    Legacy.parse_command_line(process.env.SENECA_LOG,
-      sourcemap.env.log,
-      {shortcut: true})
-  }
-
   if (process.env.SENECA_OPTIONS) {
     sourcemap.env = Common.deepextend({}, sourcemap.env,
       Jsonic(process.env.SENECA_OPTIONS))

diff --git a/test/stubs/options/options.test.js b/test/stubs/options/options.test.js
@@ -134,12 +134,10 @@ describe('options', function () {
   })
 
   it('options-env', function (done) {
-    process.env.SENECA_LOG = 'silent'
     process.env.SENECA_OPTIONS = '{"foo":"bar","a":99}'
     var si = Seneca()
     var opts = si.options()
 
-    assert.equal(0, opts.log.map.length)
     assert.equal('bar', opts.foo)
     assert.equal(99, opts.a)
     si.close(done)