From: Ant Zucaro <azucaro@gmail.com>
Date: Mon, 31 Oct 2011 01:03:48 +0000 (-0400)
Subject: If multiple servers are found with the same name, use hashkey to resolve.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e70a855aadc975c020b66cedd55143d7a849922a;p=xonotic%2Fxonstat.git

If multiple servers are found with the same name, use hashkey to resolve.
---

diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py
index df246d0..90297fa 100755
--- a/xonstat/views/submission.py
+++ b/xonstat/views/submission.py
@@ -135,6 +135,12 @@ def get_or_create_server(session=None, name=None, hashkey=None):
     try:
         # find one by that name, if it exists
         server = session.query(Server).filter_by(name=name).one()
+
+        # store new hashkey
+        if server.hashkey != hashkey:
+            server.hashkey = hashkey
+            session.add(server)
+
         log.debug("Found existing server {0}".format(server.server_id))
 
     except MultipleResultsFound, e: