Manager: fix for server registration

docker/dashboard/dev/Dockerfile

@@ -36,6 +36,8 @@ VOLUME /data/config
 VOLUME /data/storage/shared
 VOLUME /data/storage/dashboard
 
+ENV IS_DOCKER True
+
 EXPOSE 8888
 
 ADD runserver.sh /runserver.sh

docker/dashboard/dev/manage.sh

+#!/usr/bin/env bash
+
+. /data/venv/bin/activate && python /data/git/dashboard/manage.py $1 $2 $3

docker/dashboard/dev/runserver.sh

@@ -4,5 +4,5 @@
 if [ ! -d /data/git/dashboard/node_modules ]; then
 	bash setup.sh
 fi
-# Enable virtual evnvironment and start server
+# Enable virtual evnvironment and start dashboard
 . /data/venv/bin/activate && cd /data/git/dashboard && python manage.py runserver

docker/dashboard/pro/Dockerfile

@@ -48,6 +48,8 @@ VOLUME /data/config
 VOLUME /data/storage/shared
 VOLUME /data/storage/dashboard
 
+ENV IS_DOCKER True
+
 EXPOSE 8888
 
 ADD 000-default.conf /etc/apache2/sites-available/000-default.conf

docker/dashboard/pro/manage.sh

+#!/usr/bin/env bash
+
+. /data/venv/bin/activate && python /data/git/dashboard/manage.py $1 $2 $3

docker/manager/dev/runserver.sh

@@ -7,4 +7,8 @@ if [ ! -e /installed ]; then
 	touch /installed
 fi
 
+# Enable virtual evnvironment and register manager
+. /data/venv/bin/activate && cd /data/git/manager && python manage.py setup_register_manager
+
+# Run development server
 . /data/venv/bin/activate && cd /data/git/manager && python manage.py runserver

docker/manager/pro/runserver.sh

@@ -7,5 +7,8 @@ if [ ! -e /installed ]; then
 	touch /installed
 fi
 
+# Enable virtual evnvironment and register manager
+. /data/venv/bin/activate && cd /data/git/manager && python manage.py setup_register_manager
+
 # Run Apache
 /usr/sbin/apache2 -D FOREGROUND

flamenco/dashboard/application/__init__.py

@@ -10,11 +10,18 @@ app.config.update(
     SECRET_KEY='A0Zr98j/3yX R~XHH!jmN]LWX/,?RT',
 )
 
-try:
-    from application import config
-    app.config['FLAMENCO_SERVER'] = config.Config.FLAMENCO_SERVER
-except ImportError:
-    app.config['FLAMENCO_SERVER'] = 'localhost:9999'
+# Initial configuration
+from application import config_base
+app.config.from_object(config_base.Config)
+
+# If we are in a Docker container, override with some new defaults
+if os.environ.get('IS_DOCKER'):
+    from application import config_docker
+    app.config.from_object(config_docker.Config)
+
+# If a custom config file is specified, further override the config
+if os.environ.get('FLAMENCO_DASHBOARD_CONFIG'):
+    app.config.from_envvar('FLAMENCO_DASHBOARD_CONFIG')
 
 def check_connection():
     try:

flamenco/dashboard/application/config.py.example

-class Config(object):
-    DEBUG=True
-    FLAMENCO_SERVER='localhost:9999'
-
-    PORT=8888
-    HOST='0.0.0.0'

flamenco/dashboard/application/config_base.py

+class Config(object):
+    DEBUG = True
+    FLAMENCO_SERVER = 'localhost:9999'
+    PORT = 8888
+    HOST = '0.0.0.0'
+

flamenco/dashboard/application/config_docker.py

+class Config(object):
+    FLAMENCO_SERVER = 'flamenco_server:9999'

flamenco/manager/application/__init__.py

@@ -99,6 +99,7 @@ def register_manager(host, name, has_virtual_workers):
     r = http_request(app.config['FLAMENCO_SERVER'], '/managers', 'post', params=params)
 
     # If we don't find one, we proceed to create it, using the server reponse
+    # TODO handle case when token exists on the manager, but not on the server
     if not token:
         token = Setting(name='token', value=r['token'])
         db.session.add(token)

flamenco/manager/application/config_base.py

@@ -6,7 +6,7 @@ class Config(object):
     DEBUG = True
     PORT = 7777
     HOST = '0.0.0.0' # or 'localhost'
-    HOSTNAME = 'My Manager' # or use socket.gethostname()
+    NAME = 'My Manager' # or use socket.gethostname()
     FLAMENCO_SERVER = 'localhost:9999'
 
     DATABASE_URI = 'sqlite:///' + os.path.join(os.path.dirname(__file__), '../')
@@ -20,7 +20,5 @@ class Config(object):
     TMP_FOLDER = tempfile.gettempdir()
     THUMBNAIL_EXTENSIONS = set(['png'])
 
-    # Don't change this variable until the worker's code will have costant declaration of this path
-    # see controllers.py line 243 to understand
     MANAGER_STORAGE = '{0}/static/storage'.format(
         os.path.join(os.path.dirname(__file__)))

flamenco/manager/manage.py

@@ -76,38 +76,29 @@ def setup_db():
 
 
 @manager.command
-def runserver():
-    """This command is meant for development. If no configuration is found,
-    we start the app listening from all hosts, from port 7777."""
-    setup_db()
-
-    try:
-        from application import config
-        PORT = config.Config.PORT
-        DEBUG = config.Config.DEBUG
-        HOST = config.Config.HOST
-        HOSTNAME = config.Config.HOSTNAME
-        VIRTUAL_WORKERS = config.Config.VIRTUAL_WORKERS
-    except ImportError:
-        DEBUG = False
-        PORT = 7777
-        HOST = '0.0.0.0'
-        VIRTUAL_WORKERS = False
-        HOSTNAME = socket.gethostname()
-
+def setup_register_manager():
     # Register the manager to the server
     if os.environ.get('WERKZEUG_RUN_MAIN') != 'true':
-        if VIRTUAL_WORKERS:
+        if app.config['VIRTUAL_WORKERS']:
             has_virtual_worker = 1
         else:
             has_virtual_worker = 0
-        full_host = "{0}:{1}".format(HOST, PORT)
-        register_manager(full_host, HOSTNAME, has_virtual_worker)
+        full_host = "http://{0}:{1}".format(
+            app.config['HOST'], app.config['PORT'])
+        register_manager(full_host, app.config['NAME'], has_virtual_worker)
+
+
+@manager.command
+def runserver():
+    """This command is meant for development. If no configuration is found,
+    we start the app listening from all hosts, from port 7777."""
+    setup_db()
+    setup_register_manager()
 
     app.run(
-        port=PORT,
-        debug=DEBUG,
-        host=HOST,
+        port=app.config['PORT'],
+        debug=app.config['DEBUG'],
+        host=app.config['HOST'],
         threaded=True)