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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos.toolbox
Commits
2b33df66
Commit
2b33df66
authored
Apr 04, 2014
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: fix regression on process names
parent
cc1ee801
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
slapos/runner/utils.py
slapos/runner/utils.py
+4
-4
No files found.
slapos/runner/utils.py
View file @
2b33df66
...
@@ -266,7 +266,7 @@ def isSoftwareRunning(config=None):
...
@@ -266,7 +266,7 @@ def isSoftwareRunning(config=None):
Return True if slapos is still running and false if slapos if not
Return True if slapos is still running and false if slapos if not
"""
"""
# XXX-Marco what is 'config' for?
# XXX-Marco what is 'config' for?
return
isRunning
(
'slapgrid
_
sr'
)
return
isRunning
(
'slapgrid
-
sr'
)
def
runSoftwareWithLock
(
config
,
lock
=
True
):
def
runSoftwareWithLock
(
config
,
lock
=
True
):
...
@@ -288,7 +288,7 @@ def runSoftwareWithLock(config, lock=True):
...
@@ -288,7 +288,7 @@ def runSoftwareWithLock(config, lock=True):
slapgrid
=
Popen
([
config
[
'slapos'
],
'node'
,
'software'
,
'--all'
,
slapgrid
=
Popen
([
config
[
'slapos'
],
'node'
,
'software'
,
'--all'
,
'--cfg'
,
config
[
'slapos_cfg'
],
'--pidfile'
,
slapgrid_pid
,
'--cfg'
,
config
[
'slapos_cfg'
],
'--pidfile'
,
slapgrid_pid
,
'--verbose'
,
'--logfile'
,
config
[
'software_log'
]],
'--verbose'
,
'--logfile'
,
config
[
'software_log'
]],
stdout
=
logfile
,
name
=
'slapgrid
_
sr'
)
stdout
=
logfile
,
name
=
'slapgrid
-
sr'
)
if
lock
:
if
lock
:
slapgrid
.
wait
()
slapgrid
.
wait
()
#Saves the current compile software for re-use
#Saves the current compile software for re-use
...
@@ -357,7 +357,7 @@ def isInstanceRunning(config=None):
...
@@ -357,7 +357,7 @@ def isInstanceRunning(config=None):
Return True if slapos is still running and False otherwise
Return True if slapos is still running and False otherwise
"""
"""
# XXX-Marco what is 'config' for?
# XXX-Marco what is 'config' for?
return
isRunning
(
'slapgrid
_
cp'
)
return
isRunning
(
'slapgrid
-
cp'
)
def
runInstanceWithLock
(
config
,
lock
=
True
):
def
runInstanceWithLock
(
config
,
lock
=
True
):
...
@@ -376,7 +376,7 @@ def runInstanceWithLock(config, lock=True):
...
@@ -376,7 +376,7 @@ def runInstanceWithLock(config, lock=True):
slapgrid
=
Popen
([
config
[
'slapos'
],
'node'
,
'instance'
,
'--all'
,
slapgrid
=
Popen
([
config
[
'slapos'
],
'node'
,
'instance'
,
'--all'
,
'--cfg'
,
config
[
'slapos_cfg'
],
'--pidfile'
,
slapgrid_pid
,
'--cfg'
,
config
[
'slapos_cfg'
],
'--pidfile'
,
slapgrid_pid
,
'--verbose'
,
'--logfile'
,
config
[
'instance_log'
]],
'--verbose'
,
'--logfile'
,
config
[
'instance_log'
]],
stdout
=
logfile
,
name
=
'slapgrid
_
cp'
)
stdout
=
logfile
,
name
=
'slapgrid
-
cp'
)
if
lock
:
if
lock
:
slapgrid
.
wait
()
slapgrid
.
wait
()
return
(
True
if
slapgrid
.
returncode
==
0
else
False
)
return
(
True
if
slapgrid
.
returncode
==
0
else
False
)
...
...
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