Commit 42e1e173 authored by Nicolas Wavrant's avatar Nicolas Wavrant

runner: start proxy at launch time to configure slappart directory

parent 07eaa133
...@@ -10,7 +10,7 @@ import os ...@@ -10,7 +10,7 @@ import os
from slapos.htpasswd import HtpasswdFile from slapos.htpasswd import HtpasswdFile
from slapos.runner.process import setHandler from slapos.runner.process import setHandler
import sys import sys
from slapos.runner.utils import runInstanceWithLock from slapos.runner.utils import runInstanceWithLock, updateProxy, startProxy
from slapos.runner.views import * from slapos.runner.views import *
TRUE_VALUES = (1, '1', True, 'true', 'True') TRUE_VALUES = (1, '1', True, 'true', 'True')
...@@ -126,6 +126,8 @@ def serve(config): ...@@ -126,6 +126,8 @@ def serve(config):
if not os.path.exists(software_link): if not os.path.exists(software_link):
os.mkdir(software_link) os.mkdir(software_link)
setHandler() setHandler()
startProxy(app.config)
updateProxy(app.config)
config.logger.info('Running slapgrid...') config.logger.info('Running slapgrid...')
if app.config['auto_deploy_instance'] in TRUE_VALUES: if app.config['auto_deploy_instance'] in TRUE_VALUES:
runInstanceWithLock(app.config) runInstanceWithLock(app.config)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment