Commit 32d21c88 authored by Sebastien Robin's avatar Sebastien Robin Committed by Cédric de Saint Martin

fixed the way string variables were filled in haproxy config

parent 0ebb7b11
...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment