Commit 3fb4d567 authored by Łukasz Nowak's avatar Łukasz Nowak

- do not store ZEO configuration in connection dict

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44126 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b08aaa4f
......@@ -109,10 +109,10 @@ class Recipe(BaseSlapRecipe):
url_list = []
if 'activity_node_amount' in self.parameter_dict or \
'login_node_amount' in self.parameter_dict:
self.installZeo()
self.zeo_address, self.zeo_storagename = self.installZeo()
common_kw = dict(
zeo_address=self.connection_dict['zeo_address'],
zeo_storagename=self.connection_dict['zeo_storagename'],
zeo_address=self.zeo_address,
zeo_storagename=self.zeo_storagename,
ip=self.getLocalIPv4Address())
port = 12001
distribution_list = [self.installZope(port=port, name='zope_distribution',
......@@ -434,10 +434,8 @@ class Recipe(BaseSlapRecipe):
'execute')], self.ws, sys.executable, self.wrapper_directory, arguments=[
self.options['runzeo_binary'].strip(), '-C', zeo_conf_path]
)[0]
self.connection_dict['zeo_address'] = '%s:%s' % (CONFIG['zeo_ip'], CONFIG['zeo_port'])
self.connection_dict['zeo_storagename'] = CONFIG['zeo_storagename']
self.path_list.append(wrapper)
return '%s:%s' % (CONFIG['zeo_ip'], CONFIG['zeo_port']), CONFIG['zeo_storagename']
def installZope(self, ip, port, name, zeo_address=None, zeo_storagename=None,
zodb_root_path=None, with_timerservice=False, timeserver_interval=5):
......
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