Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos.toolbox
Commits
8ef31c8d
Commit
8ef31c8d
authored
Sep 29, 2014
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
runner: stop proxy when removing instances content.
Make sure we start from a consistent state.
parent
4bbb8356
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
slapos/runner/utils.py
slapos/runner/utils.py
+1
-1
slapos/runner/views.py
slapos/runner/views.py
+2
-0
No files found.
slapos/runner/utils.py
View file @
8ef31c8d
...
@@ -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
):
...
...
slapos/runner/views.py
View file @
8ef31c8d
...
@@ -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"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment