add /__heartbeat__ endpoint for load balancers - remove ping.txt - closes #481

browserid/app.js

@@ -45,6 +45,7 @@ express = require('express'),
 secrets = require('../libs/secrets.js'),
 db = require('./lib/db.js'),
 configuration = require('../libs/configuration.js'),
+heartbeat = require('../libs/heartbeat.js'),
 substitution = require('../libs/substitute.js');
 metrics = require("../libs/metrics.js"),
 logger = require("../libs/logging.js").logger;
@@ -102,9 +103,6 @@ function router(app) {
     res.render('index.ejs', {title: 'A Better Way to Sign In', fullpage: true});
   });
 
-  // BA removed .html URLs. If we have 404s,
-  // we should set up some redirects
-  
   app.get("/signup", function(req, res) {
     res.render('signup.ejs', {title: 'Sign Up', fullpage: false});
   });
@@ -141,7 +139,7 @@ function router(app) {
   REDIRECTS = {
     "/manage": "/",
     "/users": "/",
-    "/users/": "/",    
+    "/users/": "/",
     "/primaries" : "/developers",
     "/primaries/" : "/developers",
     "/developers" : "https://github.com/mozilla/browserid/wiki/How-to-Use-BrowserID-on-Your-Site"
@@ -160,6 +158,9 @@ function router(app) {
   // register all the WSAPI handlers
   wsapi.setup(app);
 
+  // setup health check / heartbeat
+  heartbeat.setup(app);
+
   // the public key
   app.get("/pk", function(req, res) {
     res.json(ca.PUBLIC_KEY.toSimpleObject());

libs/heartbeat.js

+exports.setup = function(app) {
+  app.get("/__heartbeat__", function(req, res) {
+    res.writeHead(200);
+    res.write('ok');
+    res.end();
+  });
+};

verifier/app.js

@@ -34,13 +34,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-const   path = require('path'),
-         url = require('url'),
-          fs = require('fs'),
+const    path = require('path'),
+          url = require('url'),
+           fs = require('fs'),
 certassertion = require('./lib/certassertion.js'),
-     express = require('express'),
-     metrics = require('../libs/metrics.js'),
-     logger = require('../libs/logging.js').logger;
+      express = require('express'),
+      metrics = require('../libs/metrics.js'),
+    heartbeat = require('../libs/heartbeat.js'),
+       logger = require('../libs/logging.js').logger;
 
 logger.info("verifier server starting up");
 
@@ -114,12 +115,8 @@ exports.setup = function(app) {
     process.exit();
   });
 
-  // A simple ping hook for monitoring.
-  app.get("/ping.txt", function(req ,resp) {
-    resp.writeHead(200, {"Content-Type": "text/plain"})
-    resp.write("k.");
-    resp.end();
-  });
+  // setup health check / heartbeat
+  heartbeat.setup(app);
 
   app.post('/', doVerify);
   app.post('/verify', doVerify);