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
Lu Xu
slapos.toolbox
Commits
6af6c81b
Commit
6af6c81b
authored
Sep 12, 2014
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update runner to work with new slapos node supervisorctl command.
parent
2e1c556b
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 @
6af6c81b
...
@@ -454,7 +454,7 @@ def getSlapStatus(config):
...
@@ -454,7 +454,7 @@ def getSlapStatus(config):
def
svcStopAll
(
config
):
def
svcStopAll
(
config
):
"""Stop all Instance processes on this computer"""
"""Stop all Instance processes on this computer"""
try
:
try
:
return
Popen
([
config
[
's
upervisor'
]
,
config
[
'configuration_file_path'
],
return
Popen
([
config
[
's
lapos'
],
'node'
,
'supervisorctl'
,
'--cfg'
,
config
[
'configuration_file_path'
],
'shutdown'
]).
communicate
()[
0
]
'shutdown'
]).
communicate
()[
0
]
except
:
except
:
pass
pass
...
@@ -475,7 +475,7 @@ def removeInstanceRoot(config):
...
@@ -475,7 +475,7 @@ def removeInstanceRoot(config):
def
getSvcStatus
(
config
):
def
getSvcStatus
(
config
):
"""Return all Softwares Instances process Information"""
"""Return all Softwares Instances process Information"""
result
=
Popen
([
config
[
's
upervisor'
]
,
config
[
'configuration_file_path'
],
result
=
Popen
([
config
[
's
lapos'
],
'node'
,
'supervisorctl'
,
'--cfg'
,
config
[
'configuration_file_path'
],
'status'
]).
communicate
()[
0
]
'status'
]).
communicate
()[
0
]
regex
=
"(^unix:.+
\
.socke
t
)|(^error:)|(^watchdog).*$"
regex
=
"(^unix:.+
\
.socke
t
)|(^error:)|(^watchdog).*$"
supervisord
=
[]
supervisord
=
[]
...
@@ -495,7 +495,7 @@ def getSvcTailProcess(config, process):
...
@@ -495,7 +495,7 @@ def getSvcTailProcess(config, process):
Returns:
Returns:
a string that contains the log of the process.
a string that contains the log of the process.
"""
"""
return Popen([config['
s
upervisor
']
, config['
configuration_file_path
'],
return Popen([config['
s
lapos
'], '
node
', '
supervisorctl
', '
--
cfg
'
, config['
configuration_file_path
'],
"tail", process]).communicate()[0]
"tail", process]).communicate()[0]
...
@@ -514,7 +514,7 @@ def svcStartStopProcess(config, process, action):
...
@@ -514,7 +514,7 @@ def svcStartStopProcess(config, process, action):
'
EXITED
': '
start
',
'
EXITED
': '
start
',
'
STOP
': '
stop
'
'
STOP
': '
stop
'
}
}
return Popen([config['
s
upervisor
']
, config['
configuration_file_path
'],
return Popen([config['
s
lapos
'], '
node
', '
supervisorctl
', '
--
cfg
'
, config['
configuration_file_path
'],
cmd[action], process]).communicate()[0]
cmd[action], process]).communicate()[0]
...
...
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