Merge branch 'control-server-resilience'

Based on the work made by zuntrax & mithro at cccamp15

1 files changed, 10 insertions, 0 deletions

diff --git a/voctogui/voctogui.py b/voctogui/voctogui.py
index 52bc3c0..932b8f9 100755
--- a/voctogui/voctogui.py
+++ b/voctogui/voctogui.py
@@ -24,8 +24,11 @@ Gst.init([])
 
 # import local classes
 from lib.args import Args
+from lib.config import Config
 from lib.ui import Ui
 
+import lib.connection as Connection
+
 # main class
 class Voctogui(object):
 	def __init__(self):
@@ -100,6 +103,13 @@ def main():
 	logging.info('Python Version: %s', sys.version_info)
 	logging.info('GStreamer Version: %s', Gst.version())
 
+	# connect to server
+	Connection.establish(
+		Config.get('server', 'host'))
+
+	# fetch serverconfig from server
+	Config.fetchRemoteConfig()
+
 	# init main-class and main-loop
 	logging.debug('initializing Voctogui')
 	voctogui = Voctogui()