runner: stop proxy when removing instances content.

Make sure we start from a consistent state.
parent 4bbb8356
...@@ -255,7 +255,7 @@ def startProxy(config): ...@@ -255,7 +255,7 @@ def startProxy(config):
def stopProxy(config): def stopProxy(config):
"""Stop Slapproxy server""" """Stop Slapproxy server"""
pass sup_process.stopProcess(config, "slapproxy")
def removeProxyDb(config): def removeProxyDb(config):
......
...@@ -28,6 +28,7 @@ from slapos.runner.utils import (checkSoftwareFolder, configNewSR, ...@@ -28,6 +28,7 @@ from slapos.runner.utils import (checkSoftwareFolder, configNewSR,
removeSoftwareByName, runSlapgridUntilSuccess, removeSoftwareByName, runSlapgridUntilSuccess,
saveSession, saveBuildAndRunParams, saveSession, saveBuildAndRunParams,
setMiniShellHistory, setMiniShellHistory,
stopProxy,
svcStartStopProcess, svcStopAll, tail, svcStartStopProcess, svcStopAll, tail,
updateInstanceParameter) updateInstanceParameter)
...@@ -193,6 +194,7 @@ def removeInstance(): ...@@ -193,6 +194,7 @@ def removeInstance():
flash('Instantiation in progress, cannot remove') flash('Instantiation in progress, cannot remove')
else: else:
removeProxyDb(app.config) removeProxyDb(app.config)
stopProxy(app.config)
svcStopAll(app.config) # Stop All instance process svcStopAll(app.config) # Stop All instance process
removeInstanceRoot(app.config) removeInstanceRoot(app.config)
param_path = os.path.join(app.config['etc_dir'], ".parameter.xml") param_path = os.path.join(app.config['etc_dir'], ".parameter.xml")
......
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