From fd39affc26ff4a47eeca1b9b1913f41f0b4396c3 Mon Sep 17 00:00:00 2001
From: Marco Vermeulen <vermeulen.mp@gmail.com>
Date: Fri, 12 Oct 2012 12:31:57 +0100
Subject: [PATCH] Merge conflict on building document.

---
 srv/server.groovy | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srv/server.groovy b/srv/server.groovy
index fc1bd0d8..4e8aff6d 100644
--- a/srv/server.groovy
+++ b/srv/server.groovy
@@ -128,7 +128,8 @@ private buildCsv(list){
 
 private log(command, candidate="", version="", req){
 	def date = new Date().toString()
-	def host = req.headers.host
+	def host = req.headers['x-forwarded-for']
+	def agent = req.headers['user-agent']
 	def platform = req.params['platform']
 
 	def document = [
@@ -136,6 +137,7 @@ private log(command, candidate="", version="", req){
 		candidate:candidate,
 		version:version,
 		host:host,
+		agent:agent,
 		platform:platform,
 		date:date
 	]