Merge pull request #6812 from DanielRosenwasser/errorHandlerFix

Don't use 'any' for 'errorhandler'.

errorhandler/errorhandler-tests.ts

@@ -5,3 +5,13 @@ import errorhandler = require('errorhandler');
 var app = express();
 
 app.use(errorhandler());
+
+app.use(errorhandler({ log: true }));
+
+app.use(errorhandler({ log: (err, str, req, res) => {
+    const { message, name, stack } = err;
+    const messageIsStr = message === str;
+
+    const requestWasFresh = req && req.fresh;
+    const responseContentType = res && res.contentType
+}}))

errorhandler/errorhandler.d.ts

@@ -7,6 +7,26 @@
 
 declare module "errorhandler" {
     import express = require('express');
-    function e(options?: {log?: any}): express.ErrorRequestHandler;
-    export = e;
+    
+    function errorHandler(options?: errorHandler.Options): express.ErrorRequestHandler;
+    
+    namespace errorHandler {
+        interface LoggingCallback {
+            (err: Error, str: string, req: express.Request, res: express.Response): void;
+        }
+        
+        interface Options {
+            /**
+             * Defaults to true.
+             * 
+             * Possible values:
+             *   true       : Log errors using console.error(str).
+             *   false      : Only send the error back in the response.
+             *   A function : pass the error to a function for handling.
+             */
+            log: boolean | LoggingCallback;
+        }
+    }
+    
+    export = errorHandler;
 }