From e2cad026484e36a504ce463d040722289c0c5b34 Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Thu, 10 Nov 2011 09:59:09 -0700
Subject: [PATCH] keysigner and verifier should not log /__heartbeat__ requests
- closes #537
---
bin/keysigner | 5 +++--
bin/verifier | 13 ++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/bin/keysigner b/bin/keysigner
index c62d67b92..7b9b71e99 100755
--- a/bin/keysigner
+++ b/bin/keysigner
@@ -53,6 +53,9 @@ shutdown = require('../lib/shutdown');
// create an express server
var app = express.createServer();
+// respond to health checks (before logging)
+heartbeat.setup(app);
+
// our server will log
app.use(express.logger({
format: config.get('express_log_format'),
@@ -70,8 +73,6 @@ app.use(function(req, resp, next) {
// parse POST bodies
app.use(express.bodyParser());
-heartbeat.setup(app);
-
// and our single function
app.post('/wsapi/cert_key', validate(["email", "pubkey"]), function(req, resp) {
// parse the pubkey
diff --git a/bin/verifier b/bin/verifier
index ef7d65dc3..3ba9a5774 100755
--- a/bin/verifier
+++ b/bin/verifier
@@ -53,6 +53,9 @@ logger.info("verifier server starting up");
var app = express.createServer();
+// setup health check / heartbeat (before logging)
+heartbeat.setup(app);
+
// request to logger, dev formatted which omits personal data in the requests
app.use(express.logger({
format: config.get('express_log_format'),
@@ -65,12 +68,6 @@ app.use(express.logger({
app.use(express.bodyParser());
-// shutdown when /code_update is invoked
-shutdown.installUpdateHandler(app);
-
-// setup health check / heartbeat
-heartbeat.setup(app);
-
app.post('/verify', function(req, resp, next) {
req.body = req.body || {}
@@ -103,9 +100,11 @@ app.post('/verify', function(req, resp, next) {
rp: audience
});
});
-
});
+// shutdown when /code_update is invoked
+shutdown.installUpdateHandler(app);
+
// shutdown nicely on signals
shutdown.handleTerminationSignals(app);
--
GitLab