Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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.core
Commits
27c3df49
Commit
27c3df49
authored
Apr 24, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed call to supervisor
parent
24bab1da
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+3
-2
slapos/grid/svcbackend.py
slapos/grid/svcbackend.py
+0
-1
No files found.
slapos/grid/slapgrid.py
View file @
27c3df49
...
@@ -161,7 +161,7 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
...
@@ -161,7 +161,7 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
# Parses arguments
# Parses arguments
if
argument_tuple
==
()
:
if
not
argument_tuple
:
# No arguments given to entry point : we parse sys.argv.
# No arguments given to entry point : we parse sys.argv.
argument_option_instance
=
parser
.
parse_args
()
argument_option_instance
=
parser
.
parse_args
()
else
:
else
:
...
@@ -644,7 +644,8 @@ class Slapgrid(object):
...
@@ -644,7 +644,8 @@ class Slapgrid(object):
def
_launchSupervisord
(
self
):
def
_launchSupervisord
(
self
):
launchSupervisord
(
self
.
supervisord_socket
,
launchSupervisord
(
self
.
supervisord_socket
,
self
.
supervisord_configuration_path
)
self
.
supervisord_configuration_path
,
logger
=
self
.
logger
)
def
_checkPromises
(
self
,
computer_partition
):
def
_checkPromises
(
self
,
computer_partition
):
self
.
logger
.
info
(
"Checking promises..."
)
self
.
logger
.
info
(
"Checking promises..."
)
...
...
slapos/grid/svcbackend.py
View file @
27c3df49
...
@@ -29,7 +29,6 @@
...
@@ -29,7 +29,6 @@
##############################################################################
##############################################################################
import
time
import
time
import
logging
import
os
import
os
import
sys
import
sys
import
xmlrpclib
import
xmlrpclib
...
...
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