From 0c19e2683d50713bcad57a86a4ec993eb8abf5f3 Mon Sep 17 00:00:00 2001
From: polaris <polaris-@users.noreply.github.com>
Date: Fri, 18 Apr 2014 08:28:48 -0400
Subject: [PATCH] Force initialization of database in master server

---
 master_server.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/master_server.py b/master_server.py
index 10dc3c8..4c1a17b 100644
--- a/master_server.py
+++ b/master_server.py
@@ -7,6 +7,8 @@ from gamespy_server_browser_server import GameSpyServerBrowserServer
 from gamespy_gamestats_server import GameSpyGamestatsServer
 from nintendo_nas_server import NintendoNasServer
 
+import gamespy.gs_database as gs_database
+
 import threading
 
 def start_backend_server():
@@ -42,6 +44,11 @@ def start_nas_server():
     nas_server.start()
 
 if __name__ == "__main__":
+    # Let database initialize before starting any servers.
+    # This fixes any conflicts where two servers find an uninitialized database at the same time and both try to
+    # initialize it.
+    database = gs_database.GamespyDatabase()
+
     backend_server_thread = threading.Thread(target=start_backend_server)
     backend_server_thread.start()