From: Ant Zucaro <azucaro@gmail.com>
Date: Mon, 19 Dec 2011 01:49:18 +0000 (-0500)
Subject: Use utcnow for submissions. Set REMOTE_ADDR.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=859ea6ee01515a14aa4acc012d877c389d3977d0;p=xonotic%2Fxonstat.git

Use utcnow for submissions. Set REMOTE_ADDR.
---

diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py
index 245fe30..e0456be 100755
--- a/xonstat/views/submission.py
+++ b/xonstat/views/submission.py
@@ -1,5 +1,6 @@
 import datetime
 import logging
+import os
 import pyramid.httpexceptions
 import re
 import time
@@ -17,7 +18,7 @@ def get_remote_addr(request):
     if 'X-Server-IP' in request.headers:
         return request.headers['X-Server-IP']
     else:
-        return request.remote_addr
+        return os.environ.get('HTTP_X_FORWARDED_FOR', request.remote_addr)
 
 
 def is_supported_gametype(gametype):
@@ -548,9 +549,12 @@ def stats_submit(request):
 
         gmap = get_or_create_map(session=session, name=game_meta['M'])
 
+        # FIXME: use the gmtime instead of utcnow() when the timezone bug is
+        # fixed
         game = create_game(session=session, 
-                start_dt=datetime.datetime(
-                    *time.gmtime(float(game_meta['T']))[:6]), 
+                start_dt=datetime.datetime.utcnow(),
+                #start_dt=datetime.datetime(
+                    #*time.gmtime(float(game_meta['T']))[:6]), 
                 server_id=server.server_id, game_type_cd=game_meta['G'], 
                    map_id=gmap.map_id, match_id=game_meta['I'])