Merge pull request #366 from CartoDB/express-4.x

Express 4.x

Author: Raul Ochoa

app.js

@@ -81,7 +81,8 @@ if ( ! global.settings.base_url ) {
 var version = require("./package").version;
 
 var server = require('./app/server')();
-server.listen(global.settings.node_port, global.settings.node_host, function() {
+var listener = server.listen(global.settings.node_port, global.settings.node_host);
+listener.on('listening', function() {
     console.info('Using configuration file "%s"', configurationFile);
     console.log(
         "CartoDB SQL API %s listening on %s:%s PID=%d (%s)",

app/controllers/health_check_controller.js

@@ -24,11 +24,11 @@ HealthCheckController.prototype.handleHealthCheck = function (req, res) {
             if (err) {
                 response.err = err.message;
             }
-            res.send(response, ok ? 200 : 503);
+            res.status(ok ? 200 : 503).send(response);
 
         });
     } else {
-        res.send({enabled: false, ok: true}, 200);
+        res.status(200).send({enabled: false, ok: true});
     }
 };
 

app/server.js

@@ -15,6 +15,7 @@
 //
 
 var express = require('express');
+var bodyParser = require('body-parser');
 var os = require('os');
 var Profiler = require('step-profiler');
 var StatsD = require('node-statsd').StatsD;
@@ -50,7 +51,7 @@ require('./utils/date_to_json');
 // jshint maxcomplexity:12
 function App() {
 
-    var app = express.createServer();
+    var app = express();
 
     var redisConfig = {
         host: global.settings.redis_host,
@@ -102,16 +103,6 @@ function App() {
             }
         };
         app.use(global.log4js.connectLogger(global.log4js.getLogger(), _.defaults(loggerOpts, {level:'info'})));
-    } else {
-        // Express logger uses tokens as described here: http://www.senchalabs.org/connect/logger.html
-        express.logger.token('sql', function(req) {
-            return app.getSqlQueryFromRequestBody(req);
-        });
-        app.use(express.logger({
-            buffer: true,
-            format: global.settings.log_format ||
-                ':remote-addr :method :req[Host]:url :status :response-time ms -> :res[Content-Type]'
-        }));
     }
 
     // Initialize statsD client if requested
@@ -172,9 +163,12 @@ function App() {
       });
     }
 
-    app.use(express.bodyParser());
+    app.use(bodyParser.json());
+    app.use(bodyParser.urlencoded({ extended: true }));
     app.enable('jsonp callback');
     app.set("trust proxy", true);
+    app.disable('x-powered-by');
+    app.disable('etag');
 
     // basic routing
 

app/utils/error_handler.js

@@ -25,14 +25,22 @@ module.exports = function handleException(err, res) {
     // Force inline content disposition
     res.header("Content-Disposition", 'inline');
 
-    if ( res.req && res.req.profiler ) {
-      res.req.profiler.done('finish');
-      res.header('X-SQLAPI-Profiler', res.req.profiler.toJSONString());
+    var req = res.req;
+
+    if (req && req.profiler ) {
+      req.profiler.done('finish');
+      res.header('X-SQLAPI-Profiler', req.profiler.toJSONString());
     }
 
-    res.send(msg, getStatusError(pgErrorHandler, res.req));
+    res.header('Content-Type', 'application/json; charset=utf-8');
+    res.status(getStatusError(pgErrorHandler, req));
+    if (req.query && req.query.callback) {
+        res.jsonp(msg);
+    } else {
+        res.json(msg);
+    }
 
-    if ( res.req && res.req.profiler ) {
+    if (req && req.profiler) {
       res.req.profiler.sendStats();
     }
 };