From d49f7279b328573d098018282310e5e8caa496e6 Mon Sep 17 00:00:00 2001
From: jomo <github@jomo.tv>
Date: Sun, 20 Sep 2015 21:45:37 +0200
Subject: [PATCH] log response ID first for access log

also made sure 'headers' is defined before it's used
---
 lib/response.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/response.js b/lib/response.js
index 8403ded..e78947b 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -26,18 +26,6 @@ var silent_errors = ["ETIMEDOUT", "ESOCKETTIMEDOUT", "ECONNRESET", "EHOSTUNREACH
 //  * hash:     image hash, required when body is an image
 //  * err:      a possible Error
 module.exports = function(request, response, result) {
-  response.on("close", function() {
-    logging.warn(request.id, "Connection closed");
-  });
-
-  response.on("finish", function() {
-    logging.log(request.method, request.url.href, request.id, response.statusCode, headers["Response-Time"] + "ms", "(" + (human_status[result.status] || "-") + ")");
-  });
-
-  response.on("error", function(err) {
-    logging.error(request.id, err);
-  });
-
   // These headers are the same for every response
   var headers = {
     "Content-Type": result.body && result.type || "text/plain",
@@ -47,6 +35,18 @@ module.exports = function(request, response, result) {
     "Access-Control-Allow-Origin": "*"
   };
 
+  response.on("close", function() {
+    logging.warn(request.id, "Connection closed");
+  });
+
+  response.on("finish", function() {
+    logging.log(request.id, request.method, request.url.href, response.statusCode, headers["Response-Time"] + "ms", "(" + (human_status[result.status] || "-") + ")");
+  });
+
+  response.on("error", function(err) {
+    logging.error(request.id, err);
+  });
+
   if (result.err) {
     var silent = silent_errors.indexOf(result.err.code) !== -1;
     if (result.err.stack && !silent) {