Switching from logger.log to logger.info in order to allow the contro…

…l of what messages are logged to our logging storage.
opentable · Sep 17, 2015 · 2d61b38 · 2d61b38
1 parent 69c19c6
commit 2d61b38
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 15 deletions.
diff --git 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
@@ -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
@@ -44,15 +44,15 @@ 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)
 
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
       ]