Log errors and do not send 'X-Tiler-Errors' header

lib/api/middlewares/error-middleware.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const _ = require('underscore');
 const debug = require('debug')('windshaft:cartodb:error-middleware');
 
 module.exports = function errorMiddleware (/* options */) {
     return function error (err, req, res, next) {
+        const { logger } = res.locals;
         var allErrors = Array.isArray(err) ? err : [err];
 
         allErrors = populateLimitErrors(allErrors);
@@ -15,14 +15,14 @@ module.exports = function errorMiddleware (/* options */) {
 
         var statusCode = findStatusCode(err);
 
-        setErrorHeader(allErrors, statusCode, res);
-        debug('[%s ERROR] -- %d: %s, %s', label, statusCode, err, err.stack);
-
         // If a callback was requested, force status to 200
         if (req.query && req.query.callback) {
             statusCode = 200;
         }
 
+        allErrors.forEach((err) => debug('[%s ERROR] -- %d: %s, %s', label, statusCode, err, err.stack));
+        allErrors.forEach((err) => logger.error(err));
+
         var errorResponseBody = {
             errors: allErrors.map(errorMessage),
             errors_with_context: allErrors.map(errorMessageWithContext)
@@ -135,7 +135,7 @@ function statusFromErrorMessage (errMsg) {
 
 function errorMessage (err) {
     // See https://github.com/Vizzuality/Windshaft-cartodb/issues/68
-    var message = (_.isString(err) ? err : err.message) || 'Unknown error';
+    var message = (typeof err === 'string' ? err : err.message) || 'Unknown error';
 
     return stripConnectionInfo(message);
 }
@@ -165,7 +165,7 @@ function shouldBeExposed (prop) {
 
 function errorMessageWithContext (err) {
     // See https://github.com/Vizzuality/Windshaft-cartodb/issues/68
-    var message = (_.isString(err) ? err : err.message) || 'Unknown error';
+    var message = (typeof err === 'string' ? err : err.message) || 'Unknown error';
 
     var error = {
         type: err.type || 'unknown',
@@ -181,53 +181,3 @@ function errorMessageWithContext (err) {
 
     return error;
 }
-
-function setErrorHeader (errors, statusCode, res) {
-    const errorsCopy = errors.slice(0);
-    const mainError = errorsCopy.shift();
-
-    const errorsLog = {
-        mainError: {
-            statusCode: statusCode || 200,
-            message: mainError.message,
-            name: mainError.name,
-            label: mainError.label,
-            type: mainError.type,
-            subtype: mainError.subtype
-        }
-    };
-
-    errorsLog.moreErrors = errorsCopy.map(error => {
-        return {
-            message: error.message,
-            name: error.name,
-            label: error.label,
-            type: error.type,
-            subtype: error.subtype
-        };
-    });
-
-    res.set('X-Tiler-Errors', stringifyForLogs(errorsLog));
-}
-
-/**
- * Remove problematic nested characters
- * from object for logs RegEx
- *
- * @param {Object} object
- */
-function stringifyForLogs (object) {
-    Object.keys(object).map(key => {
-        if (typeof object[key] === 'string') {
-            object[key] = object[key].replace(/[^a-zA-Z0-9]/g, ' ');
-        } else if (typeof object[key] === 'object') {
-            stringifyForLogs(object[key]);
-        } else if (object[key] instanceof Array) {
-            for (const element of object[key]) {
-                stringifyForLogs(element);
-            }
-        }
-    });
-
-    return JSON.stringify(object);
-}