From 12957b191805f42b4642ddabe7bde320e31820dd Mon Sep 17 00:00:00 2001
From: Jason Williams <jaswilli@gmail.com>
Date: Fri, 19 Sep 2014 16:31:22 +0000
Subject: [PATCH] Adjust morgan call to avoid deprecation warning

No Issue
- Change the invocation of the morgan logging package to
  conform to the new function signature introduced in
  morgan 1.2.0.
---
 core/server/middleware/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/server/middleware/index.js b/core/server/middleware/index.js
index b568b59057..5639e577d9 100644
--- a/core/server/middleware/index.js
+++ b/core/server/middleware/index.js
@@ -256,9 +256,9 @@ setupMiddleware = function (server, adminExpress) {
     // Logging configuration
     if (logging !== false) {
         if (expressServer.get('env') !== 'development') {
-            expressServer.use(logger(logging || {}));
+            expressServer.use(logger('combined', logging));
         } else {
-            expressServer.use(logger(logging || 'dev'));
+            expressServer.use(logger('dev', logging));
         }
     }