Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Titouan Soulard
slapos
Commits
15c60fda
Commit
15c60fda
authored
Jul 13, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't crash if one slave is bad
parent
471c780c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
slapos/recipe/kvm_frontend/__init__.py
slapos/recipe/kvm_frontend/__init__.py
+11
-6
No files found.
slapos/recipe/kvm_frontend/__init__.py
View file @
15c60fda
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
##############################################################################
##############################################################################
from
slapos.recipe.librecipe
import
GenericBaseRecipe
,
GenericSlapRecipe
from
slapos.recipe.librecipe
import
GenericBaseRecipe
,
GenericSlapRecipe
import
json
import
json
import
traceback
import
zc.buildout
import
zc.buildout
class
Recipe
(
GenericSlapRecipe
):
class
Recipe
(
GenericSlapRecipe
):
...
@@ -127,11 +128,15 @@ class Recipe(GenericSlapRecipe):
...
@@ -127,11 +128,15 @@ class Recipe(GenericSlapRecipe):
# Send connection parameters of slave instances
# Send connection parameters of slave instances
site_url
=
"https://%s:%s/"
%
(
self
.
options
[
'domain'
],
self
.
options
[
'port'
])
site_url
=
"https://%s:%s/"
%
(
self
.
options
[
'domain'
],
self
.
options
[
'port'
])
for
slave
in
rewrite_rule_list
:
for
slave
in
rewrite_rule_list
:
self
.
setConnectionDict
(
try
:
dict
(
url
=
"%s%s"
%
(
site_url
,
slave
[
'resource'
]),
self
.
setConnectionDict
(
domainname
=
self
.
options
[
'domain'
],
dict
(
url
=
"%s%s"
%
(
site_url
,
slave
[
'resource'
]),
port
=
self
.
options
[
'port'
],
domainname
=
self
.
options
[
'domain'
],
resource
=
slave
[
'resource'
]),
port
=
self
.
options
[
'port'
],
slave
[
'reference'
])
resource
=
slave
[
'resource'
]),
slave
[
'reference'
])
except
:
self
.
logger
.
fatal
(
"Error while sending slave %s informations: %s"
,
slave
[
'reference'
],
traceback
.
format_exc
())
return
[
map_file
,
conf_file
,
runner_path
]
return
[
map_file
,
conf_file
,
runner_path
]
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