From 2d61b3895d5014c1994abba8ceddacab0a3b2e63 Mon Sep 17 00:00:00 2001 From: Agustin Colchado Date: Thu, 17 Sep 2015 00:28:45 -0700 Subject: [PATCH] Switching from logger.log to logger.info in order to allow the control of what messages are logged to our logging storage. --- src/middleware/BaseMiddleware.coffee | 2 +- src/webserver/BaseController.coffee | 2 +- src/webserver/BaseWebServer.coffee | 6 +++--- src/webserver/ControllerRegistration.coffee | 4 +++- test/unit/middleware/BaseMiddlewareSpec.coffee | 9 +++------ test/unit/middleware/ErrorMiddlewareSpec.coffee | 2 +- .../WinstonRequestLoggingMiddlewareSpec.coffee | 2 +- test/unit/webserver/BaseWebServerSpec.coffee | 2 +- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/middleware/BaseMiddleware.coffee b/src/middleware/BaseMiddleware.coffee index 5574c03..781f781 100644 --- a/src/middleware/BaseMiddleware.coffee +++ b/src/middleware/BaseMiddleware.coffee @@ -3,4 +3,4 @@ module.exports = (Logger)-> class BaseMiddleware configure:()-> - Logger.log "Registering Middleware: #{@constructor.name}" + Logger.info "Registering Middleware: #{@constructor.name}" diff --git a/src/webserver/BaseController.coffee b/src/webserver/BaseController.coffee index 450a827..25d3bb2 100644 --- a/src/webserver/BaseController.coffee +++ b/src/webserver/BaseController.coffee @@ -6,4 +6,4 @@ module.exports = (config, Logger)-> @rootWebPath = config.RootWebPath or "" configure:()-> - Logger.log "Registering controller: #{@constructor.name}" + Logger.info "Registering controller: #{@constructor.name}" diff --git a/src/webserver/BaseWebServer.coffee b/src/webserver/BaseWebServer.coffee index 06bfcfc..af4c237 100644 --- a/src/webserver/BaseWebServer.coffee +++ b/src/webserver/BaseWebServer.coffee @@ -44,7 +44,7 @@ module.exports = (express, DefaultMiddleware, PromiseMiddleware, Logger, Promise startInternal:()-> new Promise (resolve, reject)=> @server = @app.listen config.Port, ()=> - Logger.log @startedMessage() + Logger.info @startedMessage() resolve() Promise.promisifyAll(@server) @@ -52,7 +52,7 @@ module.exports = (express, DefaultMiddleware, PromiseMiddleware, Logger, Promise stop:()-> (@server?.closeAsync?() or Promise.resolve()) .finally => - Logger.log "Express server stopped" + Logger.info "Express server stopped" startedMessage:()-> @@ -63,5 +63,5 @@ module.exports = (express, DefaultMiddleware, PromiseMiddleware, Logger, Promise logSectionHeader: (message)-> Logger.log "========================" - Logger.log "= #{message}" + Logger.info "= #{message}" Logger.log "========================" diff --git a/src/webserver/ControllerRegistration.coffee b/src/webserver/ControllerRegistration.coffee index f1efadf..40f6758 100644 --- a/src/webserver/ControllerRegistration.coffee +++ b/src/webserver/ControllerRegistration.coffee @@ -15,4 +15,6 @@ module.exports = ($injector, _, Logger, BaseController)-> .invoke("configure", app) .value().length - Logger.log "Registered #{registeredCount} Controller(s)" + Logger.info "Registered #{registeredCount} Controller(s)", {count: registeredCount} + + registeredCount diff --git a/test/unit/middleware/BaseMiddlewareSpec.coffee b/test/unit/middleware/BaseMiddlewareSpec.coffee index dc7f45b..62d7369 100644 --- a/test/unit/middleware/BaseMiddlewareSpec.coffee +++ b/test/unit/middleware/BaseMiddlewareSpec.coffee @@ -5,11 +5,6 @@ describe "BaseMiddleware", -> @Logger.useRecorder() - - - it "should exist", -> - expect(@BaseMiddleware).to.exist - it "should log subclass registration", -> self = this myMiddleware = @@ -22,8 +17,10 @@ describe "BaseMiddleware", -> myMiddleware.configure("app") expect(@Logger.recorded.log).to.deep.equal [ - [ 'Registering Middleware: MyMiddleware' ], [ 'Subclass called' ] ] + expect(@Logger.recorded.info).to.deep.equal [ + [ 'Registering Middleware: MyMiddleware' ] + ] diff --git a/test/unit/middleware/ErrorMiddlewareSpec.coffee b/test/unit/middleware/ErrorMiddlewareSpec.coffee index b752918..9e82bc1 100644 --- a/test/unit/middleware/ErrorMiddlewareSpec.coffee +++ b/test/unit/middleware/ErrorMiddlewareSpec.coffee @@ -40,7 +40,7 @@ describe "ErrorMiddleware", -> afterEach ()-> @webServer?.stop().then => - expect(@_.last(@Logger.recorded.log)).to.deep.equal [ + expect(@_.last(@Logger.recorded.info)).to.deep.equal [ "Express server stopped" ] diff --git a/test/unit/middleware/WinstonRequestLoggingMiddlewareSpec.coffee b/test/unit/middleware/WinstonRequestLoggingMiddlewareSpec.coffee index 34c09e8..bf36517 100644 --- a/test/unit/middleware/WinstonRequestLoggingMiddlewareSpec.coffee +++ b/test/unit/middleware/WinstonRequestLoggingMiddlewareSpec.coffee @@ -74,7 +74,7 @@ describe "WinstonRequestLoggingMiddleware", -> afterEach -> @webServer?.stop().then => - expect(@_.last(@Logger.recorded.log)).to.deep.equal [ + expect(@_.last(@Logger.recorded.info)).to.deep.equal [ "Express server stopped" ] diff --git a/test/unit/webserver/BaseWebServerSpec.coffee b/test/unit/webserver/BaseWebServerSpec.coffee index 9716710..b43478a 100644 --- a/test/unit/webserver/BaseWebServerSpec.coffee +++ b/test/unit/webserver/BaseWebServerSpec.coffee @@ -23,7 +23,7 @@ describe "BaseWebServer", -> afterEach -> @webServer?.stop().then => - expect(@_.last(@Logger.recorded.log)).to.deep.equal [ + expect(@_.last(@Logger.recorded.info)).to.deep.equal [ "Express server stopped" ]