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
Tristan Cavelier
slapos.toolbox
Commits
20a04993
Commit
20a04993
authored
Jul 31, 2012
by
Antoine Catton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix container start/stop bug
parent
079c8333
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
slapos/container/prepare.py
slapos/container/prepare.py
+5
-5
No files found.
slapos/container/prepare.py
View file @
20a04993
...
@@ -17,7 +17,7 @@ class SlapContainerError(Exception):
...
@@ -17,7 +17,7 @@ class SlapContainerError(Exception):
def
main
(
sr_directory
,
partition_list
,
bridge_name
):
def
main
(
sr_directory
,
partition_list
,
bridge_name
):
started_containers
=
set
()
to_start
=
set
()
for
partition_path
in
partition_list
:
for
partition_path
in
partition_list
:
slapcontainer_filename
=
os
.
path
.
join
(
partition_path
,
slapcontainer_filename
=
os
.
path
.
join
(
partition_path
,
'.slapcontainer'
)
'.slapcontainer'
)
...
@@ -38,9 +38,9 @@ def main(sr_directory, partition_list, bridge_name):
...
@@ -38,9 +38,9 @@ def main(sr_directory, partition_list, bridge_name):
slapcontainer_conf
)
==
'stopped'
:
slapcontainer_conf
)
==
'stopped'
:
start
(
sr_directory
,
partition_path
,
start
(
sr_directory
,
partition_path
,
slapcontainer_conf
)
slapcontainer_conf
)
started_containers
.
add
(
to_start
.
add
(
slapcontainer_conf
.
get
(
'requested'
,
'name'
)
slapcontainer_conf
.
get
(
'requested'
,
'name'
)
)
)
else
:
else
:
if
status
(
sr_directory
,
partition_path
,
if
status
(
sr_directory
,
partition_path
,
slapcontainer_conf
)
==
'started'
:
slapcontainer_conf
)
==
'started'
:
...
@@ -59,7 +59,7 @@ def main(sr_directory, partition_list, bridge_name):
...
@@ -59,7 +59,7 @@ def main(sr_directory, partition_list, bridge_name):
except
SlapContainerError
:
except
SlapContainerError
:
active_containers
=
set
()
active_containers
=
set
()
to_stop
=
active_containers
-
started_containers
to_stop
=
active_containers
-
to_start
for
container
in
to_stop
:
for
container
in
to_stop
:
try
:
try
:
...
...
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