Commit e92b45e5 authored by Vincent Pelletier's avatar Vincent Pelletier

Fix declaration of multiple master nodes in zope.conf.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@1656 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 4e5eba85
...@@ -51,7 +51,8 @@ class ConfigurationManager(object): ...@@ -51,7 +51,8 @@ class ConfigurationManager(object):
if not masters: if not masters:
return [] return []
# load master node list except itself # load master node list except itself
return util.parseMasterList(masters, except_node=self.getBind()) return util.parseMasterList(masters, except_node=self.getBind(),
separator='/')
def getBind(self): def getBind(self):
""" Get the address to bind to """ """ Get the address to bind to """
......
...@@ -68,12 +68,12 @@ def resolve(hostname): ...@@ -68,12 +68,12 @@ def resolve(hostname):
return address_list[0] return address_list[0]
def parseMasterList(masters, except_node=None): def parseMasterList(masters, except_node=None, separator=' '):
if not masters: if not masters:
return [] return []
# load master node list # load master node list
master_node_list = [] master_node_list = []
for node in masters.split('/'): for node in masters.split(separator):
ip_address, port = node.split(':') ip_address, port = node.split(':')
ip_address = resolve(ip_address) ip_address = resolve(ip_address)
address = (ip_address, int(port)) address = (ip_address, int(port))
......
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