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
Nicolas Wavrant
slapos.toolbox
Commits
554abbd7
Commit
554abbd7
authored
Apr 22, 2020
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
runner: never remove slapproxy's database
parent
4407749e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
17 deletions
+1
-17
slapos/runner/utils.py
slapos/runner/utils.py
+1
-17
No files found.
slapos/runner/utils.py
View file @
554abbd7
...
...
@@ -324,13 +324,6 @@ def stopProxy(config):
return
sup_process
.
stopProcess
(
config
,
"slapproxy"
)
def
removeProxyDb
(
config
):
"""Remove Slapproxy database, this is used to initialize proxy for example when
configuring new Software Release"""
if
os
.
path
.
exists
(
config
[
'database_uri'
]):
os
.
unlink
(
config
[
'database_uri'
])
def
isSoftwareRunning
(
config
):
"""
Return True if slapos is still running and false if slapos if not
...
...
@@ -548,11 +541,6 @@ def removeCurrentInstance(config):
# Stop all processes
svcStopAll
(
config
)
if
stopProxy
(
config
):
removeProxyDb
(
config
)
startProxy
(
config
)
else
:
return
"Something went wrong when trying to stop slapproxy."
# Remove Instance directory and data related to the instance
try
:
...
...
@@ -664,11 +652,7 @@ def newSoftware(folder, config, session):
pass
with open(os.path.join(basedir, ".project"), '
w
') as f:
f.write(folder + "/")
#Clean sapproxy Database
stopProxy(config)
removeProxyDb(config)
startProxy(config)
#Stop runngin process and remove existing instance
#Stop running process and remove existing instance
logger.warning("User created a new SR. Removing all instances...")
removeCurrentInstance(config)
session['
title
'] = getProjectTitle(config)
...
...
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