runner: always keep slapproxy running

Start slapproxy at runner startup and when instance is removed in webrunner. This fix resiliency problem when proxy.db file does not exist.

/reviewed-on nexedi/slapos.toolbox!36

slapos/runner/run.py

@@ -12,7 +12,7 @@ import urlparse
 from slapos.htpasswd import HtpasswdFile
 from slapos.runner.process import setHandler
 import sys
-from slapos.runner.utils import runInstanceWithLock
+from slapos.runner.utils import runInstanceWithLock, startProxy
 from slapos.runner.views import *
 from slapos.runner.gittools import cloneRepo, switchBranch
 from git import GitCommandError
@@ -147,6 +147,9 @@ def serve(config):
   except GitCommandError, e:
     app.logger.warning('Error while cloning default repository: %s' % str(e))
     traceback.print_exc()
+  # Start slapproxy here when runner is starting
+  app.logger.info('Stating slapproxy...')
+  startProxy(app.config)
   app.logger.info('Running slapgrid...')
   if app.config['auto_deploy_instance'] in TRUE_VALUES:
     import thread

slapos/runner/utils.py

@@ -473,6 +473,7 @@ def removeCurrentInstance(config):
   svcStopAll(config)
   if stopProxy(config):
     removeProxyDb(config)
+    startProxy(config)
   else:
     return "Something went wrong when trying to stop slapproxy."