YUKI Hiroshi
null+****@clear*****
Fri Oct 17 12:03:38 JST 2014
YUKI Hiroshi 2014-10-17 12:03:38 +0900 (Fri, 17 Oct 2014) New Revision: bf261249b1c410ce59a517975d1ca6e4379964f9 https://github.com/droonga/express-droonga/commit/bf261249b1c410ce59a517975d1ca6e4379964f9 Message: Add console logger implementation (mainly for testing) Added files: lib/console-logger.js Modified files: lib/adapter/http.js lib/droonga-protocol/connection.js lib/droonga-protocol/receiver.js package.json test/test-utils.js Modified: lib/adapter/http.js (+2 -1) =================================================================== --- lib/adapter/http.js 2014-10-17 11:47:26 +0900 (d5144d3) +++ lib/adapter/http.js 2014-10-17 12:03:38 +0900 (7f4535d) @@ -1,6 +1,7 @@ var command = require('./command'); var wrapper = require('./wrapper'); var api = require('./api'); +var ConsoleLogger = require('../console-logger').ConsoleLogger; function createRequestResponseHandler(params) { params = params || {}; @@ -123,7 +124,7 @@ exports.register = function(application, params) { var prefix = params.prefix || ''; prefix = prefix.replace(/\/$/, ''); - var logger = params.logger || console; + var logger = params.logger || new ConsoleLogger(); var commandSets = api.normalize(params.plugins); Added: lib/console-logger.js (+13 -0) 100755 =================================================================== --- /dev/null +++ lib/console-logger.js 2014-10-17 12:03:38 +0900 (eec1291) @@ -0,0 +1,13 @@ +var winston = require('winston'); + +function ConsoleLogger() { + var logger = new winston.Logger({ + transports: [ + new winston.transports.Console() + ] + }); + logger.transports.console.level = 'warn'; + return logger; +} + +exports.ConsoleLogger = ConsoleLogger; Modified: lib/droonga-protocol/connection.js (+2 -1) =================================================================== --- lib/droonga-protocol/connection.js 2014-10-17 11:47:26 +0900 (668938c) +++ lib/droonga-protocol/connection.js 2014-10-17 12:03:38 +0900 (77766c7) @@ -11,6 +11,7 @@ var EventEmitter = require('events').EventEmitter; var fluent = require('fluent-logger'); var FluentReceiver = require('./receiver').FluentReceiver; var util = require('util'); +var ConsoleLogger = require('../console-logger').ConsoleLogger; var DEFAULT_FLUENT_TAG = Connection.DEFAULT_FLUENT_TAG = @@ -36,7 +37,7 @@ var DEFAULT_RESPONSE_TIMEOUT = function Connection(params) { EventEmitter.call(this); this._params = params || {}; - this._logger = this._params.logger || console; + this._logger = this._params.logger || new ConsoleLogger(); this._init(); } Modified: lib/droonga-protocol/receiver.js (+2 -1) =================================================================== --- lib/droonga-protocol/receiver.js 2014-10-17 11:47:26 +0900 (3073918) +++ lib/droonga-protocol/receiver.js 2014-10-17 12:03:38 +0900 (85c7d67) @@ -2,12 +2,13 @@ var util = require('util'); var net = require('net'); var EventEmitter = require('events').EventEmitter; var msgpack = require('msgpack'); +var ConsoleLogger = require('../console-logger').ConsoleLogger; function MsgPackReceiver(port, options) { EventEmitter.call(this); this.port = port || undefined; options = options || {}; - this._logger = options.logger || console; + this._logger = options.logger || new ConsoleLogger(); this._connections = []; this._init(); } Modified: package.json (+2 -1) =================================================================== --- package.json 2014-10-17 11:47:26 +0900 (c9ca1fb) +++ package.json 2014-10-17 12:03:38 +0900 (631729a) @@ -32,7 +32,8 @@ "method-override": "*", "msgpack": "*", "serve-static": "*", - "socket.io": "*" + "socket.io": "*", + "winston": "*" }, "devDependencies": { "express": ">=4.0", Modified: test/test-utils.js (+4 -1) =================================================================== --- test/test-utils.js 2014-10-17 11:47:26 +0900 (0277afb) +++ test/test-utils.js 2014-10-17 12:03:38 +0900 (8a282bf) @@ -13,6 +13,9 @@ exports.FluentReceiver = FluentReceiver; var Connection = require('../lib/droonga-protocol/connection').Connection; +var ConsoleLogger = require('../lib/console-logger').ConsoleLogger; +var logger = new ConsoleLogger(); + var testSendPort = exports.testSendPort = 3333; var testReceivePort = exports.testReceivePort = 3334; var testServerPort = exports.testServerPort = 3335; @@ -259,7 +262,7 @@ function createBackend() { backend.clearMessages(); backend.on('receive', function(data) { - console.debug('test-utils.createBackend.receive %d', backend._id); + logger.debug('test-utils.createBackend.receive %d', backend._id); backend.received.push(data); if (backend.reservedResponses.length > 0) { var response = backend.reservedResponses.shift(); -------------- next part -------------- HTML����������������������������...Télécharger