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 df246d0326458c5b4fb74a50850bce7caca4dfd6..90297fa9e9da58f73b722b6b95740608f84e74e0 100755 (executable)
--- 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:\r
         # find one by that name, if it exists\r
         server = session.query(Server).filter_by(name=name).one()\r
+\r
+        # store new hashkey\r
+        if server.hashkey != hashkey:\r
+            server.hashkey = hashkey\r
+            session.add(server)\r
+\r
         log.debug("Found existing server {0}".format(server.server_id))\r
 \r
     except MultipleResultsFound, e:\r