Merge pull request #23 from silvermine/fix_22_requestid_logging

Refs #22 Mostly revert "Fix "console.error is not a function" on newer versions of node"
silvermine · Dec 17, 2018 · a952c45 · a952c45
2 parents 199db49 + 499c233
commit a952c45
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/src/ResponseBuilder.js b/src/ResponseBuilder.js
@@ -1,7 +1,6 @@
 'use strict';
 
 var _ = require('underscore'),
-    log = console.log.bind(console), // eslint-disable-line no-console
     codes = require('http-status-codes'),
     Class = require('class.extend'),
     APIError = require('./APIError'),
@@ -205,7 +204,7 @@ module.exports = Class.extend({
          this.body(_.map(this._errors, function(err) {
             var o = err.toResponseObject();
 
-            log('API response includes error: %j', o);
+            console.log('API response includes error: %j', o); // eslint-disable-line no-console
             return o;
          }));
       }

diff --git a/src/responseBuilderHandler.js b/src/responseBuilderHandler.js
@@ -1,8 +1,7 @@
 'use strict';
 
 var Q = require('q'),
-    ResponseBuilder = require('./ResponseBuilder'),
-    log = console.log.bind(console); // eslint-disable-line no-console
+    ResponseBuilder = require('./ResponseBuilder');
 
 /**
  * In our APIs, we often have errors that are several promises deep, and without this,
@@ -15,14 +14,16 @@ Q.longStackSupport = true;
 module.exports = function(promiseReturningHandlerFn, request, cb, CustomRespBuilderClass) {
    Q.promised(promiseReturningHandlerFn)()
       .then(function(respBuilder) {
-         log('completed with %s millis left', request.getContext().getRemainingTimeInMillis());
+         // eslint-disable-next-line no-console
+         console.log('completed with %s millis left', request.getContext().getRemainingTimeInMillis());
          cb(undefined, respBuilder.toResponse(request));
       })
       .catch(function(err) {
          var RB = CustomRespBuilderClass || ResponseBuilder,
              respBuilder = new RB().serverError().rb();
 
-         log('ERROR:', err, err.stack);
+         // eslint-disable-next-line no-console
+         console.log('ERROR:', err, err.stack);
          cb(undefined, respBuilder.toResponse(request));
       })
       .done();

diff --git a/tests/responseBuilderHandler.test.js b/tests/responseBuilderHandler.test.js
@@ -12,25 +12,13 @@ var _ = require('underscore'),
 
 describe('responseBuilderHandler', function() {
    var context = { getRemainingTimeInMillis: _.noop },
-       req, respBuilder, revertHandler, revertRB;
+       req, respBuilder;
 
    beforeEach(function() {
-      revertHandler = handler.__set__({
-         log: _.noop,
-      });
-      revertRB = ResponseBuilder.__set__({
-         log: _.noop,
-      });
-
       req = new Request({}, context);
       respBuilder = new ResponseBuilder();
    });
 
-   afterEach(function() {
-      revertHandler();
-      revertRB();
-   });
-
    it('calls the function and passes the response from its return value to the callback', function(done) {
       var fn = sinon.stub(),
           cb;