diff --git a/dadi/lib/api/index.js b/dadi/lib/api/index.js index 6dd786ac..1917518e 100755 --- a/dadi/lib/api/index.js +++ b/dadi/lib/api/index.js @@ -1,4 +1,5 @@ var _ = require('underscore') +var debug = require('debug')('api') var fs = require('fs') var http = require('http') var https = require('https') @@ -108,7 +109,7 @@ Api.prototype.use = function (path, handler) { regex: regex }) - log.warn({module: 'api'}, 'Loaded ' + path) + debug('loaded %s', path) this.paths.sort((a, b) => { return b.order - a.order diff --git a/dadi/lib/cache/index.js b/dadi/lib/cache/index.js index 04a07204..5b8bf3c0 100755 --- a/dadi/lib/cache/index.js +++ b/dadi/lib/cache/index.js @@ -1,10 +1,10 @@ /** * @module Cache */ +var _ = require('underscore') var crypto = require('crypto') var path = require('path') var url = require('url') -var _ = require('underscore') var config = require(path.join(__dirname, '/../../../config.js')) var log = require('@dadi/logger') @@ -18,7 +18,6 @@ var cache = new DadiCache(config.get('caching')) * @param {Server} server - the main server instance */ var Cache = function (server) { - log.info({module: 'cache'}, 'Cache logging started.') this.server = server this.enabled = config.get('caching.directory.enabled') || config.get('caching.redis.enabled') this.encoding = 'utf8' diff --git a/dadi/lib/controller/router.js b/dadi/lib/controller/router.js index a579fc50..3ecb38d3 100644 --- a/dadi/lib/controller/router.js +++ b/dadi/lib/controller/router.js @@ -3,6 +3,7 @@ REWRITE INFO: https://github.com/tinganho/connect-modrewrite */ var _ = require('underscore') +var debug = require('debug')('router') var es = require('event-stream') var fs = require('fs') var path = require('path') @@ -22,8 +23,6 @@ var RouteValidator = require(path.join(__dirname, '../datasource/route-validator var rewriteFunction = null var Router = function (server, options) { - log.info({module: 'router'}, 'Router logging started.') - this.data = {} this.params = {} this.constraints = {} @@ -149,7 +148,7 @@ Router.prototype.constrain = function (route, constraint) { // add constraint from /{routesPath}/constraints.js if it exists if (this.handlers[constraint]) { this.constraints[route] = this.handlers[constraint] - log.info({module: 'router'}, "Added route constraint function '%s' for '%s'", constraint, route) + debug('added route constraint function "%s" for %s', constraint, route) } else { var error = "Route constraint '" + constraint + "' not found. Is it defined in '" + this.options.routesPath + "/constraints.js'?" var err = new Error(error) diff --git a/dadi/lib/dust/index.js b/dadi/lib/dust/index.js index c9c2ba0c..fa4245f5 100644 --- a/dadi/lib/dust/index.js +++ b/dadi/lib/dust/index.js @@ -1,5 +1,6 @@ 'use strict' +const debug = require('debug')('dust') const dust = require('dustjs-linkedin') const fs = require('fs') const mkdirp = require('mkdirp') @@ -63,6 +64,7 @@ Dust.prototype.load = function (source, templateName) { } Dust.prototype.loadDirectory = function (directory, prefix, recursive) { + debug('loadDirectory %o %s %s', directory, prefix, recursive) prefix = prefix || '' return new Promise((resolve, reject) => { diff --git a/dadi/lib/middleware/index.js b/dadi/lib/middleware/index.js index a4c6400d..71b8261a 100644 --- a/dadi/lib/middleware/index.js +++ b/dadi/lib/middleware/index.js @@ -1,11 +1,12 @@ /** * @module Middleware */ -var path = require('path') +var debug = require('debug')('middleware') var log = require('@dadi/logger') +var path = require('path') var Middleware = function (name, options) { - log.info({module: 'middleware'}, 'Middleware logging started (' + name + ').') + debug('loaded %s', name) this.name = name this.options = options || {} diff --git a/main.js b/main.js index 290e2ed0..8fcd7d80 100644 --- a/main.js +++ b/main.js @@ -1,6 +1,7 @@ var chokidar = require('chokidar') var cluster = require('cluster') var config = require('./config') +var debug = require('debug')('cluster') var fs = require('fs') var path = require('path') @@ -66,11 +67,11 @@ if (config.get('cluster')) { } } else { // Single thread start - log.info('Starting DADI Web in single thread mode.') + debug('starting DADI Web in single thread mode.') app = require(path.join(__dirname, '/index.js')) app.start(function () { - log.info('Process ' + process.pid + ' is listening for incoming requests') + debug('process ' + process.pid + ' is listening for incoming requests') }) } diff --git a/package.json b/package.json index ceb80553..5ba33fab 100644 --- a/package.json +++ b/package.json @@ -25,10 +25,11 @@ "colors": "latest", "common-dustjs-helpers": "^0.1.0", "compression": "^1.6.0", - "connect-mongo": "1.0.1", + "connect-mongo": "latest", "connect-redis": "3.0.2", "console-stamp": "^0.2.2", "convict": "2.0.0", + "debug": "^2.6.1", "dustjs-helpers": "^1.7.3", "dustjs-linkedin": "^2.7.2", "event-stream": "^3.3.1", @@ -40,7 +41,7 @@ "marked": "^0.3.5", "mkdirp": "^0.5.1", "moment": "^2.10.6", - "mongodb": "1.4.7", + "mongodb": "2.2.x", "node-uuid": "latest", "path-to-regexp": "^1.2.1", "perfy": "^1.1.0",