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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jean-Paul Smets
slapos
Commits
32d21c88
Commit
32d21c88
authored
Sep 12, 2011
by
Sebastien Robin
Committed by
Cédric de Saint Martin
Sep 16, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed the way string variables were filled in haproxy config
parent
0ebb7b11
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
slapos/recipe/erp5/__init__.py
slapos/recipe/erp5/__init__.py
+2
-2
No files found.
slapos/recipe/erp5/__init__.py
View file @
32d21c88
...
@@ -555,14 +555,14 @@ class Recipe(BaseSlapRecipe):
...
@@ -555,14 +555,14 @@ class Recipe(BaseSlapRecipe):
# maxconn should be set as the maximum thread we have per zope, like this
# maxconn should be set as the maximum thread we have per zope, like this
# haproxy will manage the queue of request with the possibility to
# haproxy will manage the queue of request with the possibility to
# move a request to another node if the initially selected one is dead
# move a request to another node if the initially selected one is dead
server_template
=
""" server %(name)s %(address)s cookie %(name)s check inter 3s rise 1 fall 2 maxconn %(cluster_zope_thread_amount)s"""
%
server_template
=
""" server %(name)s %(address)s cookie %(name)s check inter 3s rise 1 fall 2 maxconn %(cluster_zope_thread_amount)s"""
config
=
dict
(
name
=
name
,
ip
=
ip
,
port
=
port
,
config
=
dict
(
name
=
name
,
ip
=
ip
,
port
=
port
,
cluster_zope_thread_amount
=
self
.
options
.
get
(
'cluster_zope_thread_amount'
,
1
),
server_check_path
=
server_check_path
,)
server_check_path
=
server_check_path
,)
i
=
1
i
=
1
server_list
=
[]
server_list
=
[]
for
url
in
url_list
:
for
url
in
url_list
:
server_list
.
append
(
server_template
%
dict
(
name
=
'%s_%s'
%
(
name
,
i
),
server_list
.
append
(
server_template
%
dict
(
name
=
'%s_%s'
%
(
name
,
i
),
cluster_zope_thread_amount
=
self
.
options
.
get
(
'cluster_zope_thread_amount'
,
1
),
address
=
url
))
address
=
url
))
i
+=
1
i
+=
1
config
[
'server_text'
]
=
'
\
n
'
.
join
(
server_list
)
config
[
'server_text'
]
=
'
\
n
'
.
join
(
server_list
)
...
...
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