From 55128ccebe18604d3c3dc2d1ca71468b85c603ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Thu, 10 Mar 2011 16:17:10 +0000
Subject: [PATCH] - drop usage global dict in kumo for cleaner and more
resuable implemnetation
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44148 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5/src/slapos/recipe/erp5/__init__.py | 27 +++++++++----------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
index b8b6783a76..dffbe47cb9 100644
--- a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
+++ b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
@@ -47,11 +47,6 @@ CONFIG = dict(
mysql_user='user',
mysql_test_database='test_erp5',
mysql_test_user='test_user',
- # Kumofs
- kumo_manager_port=13101,
- kumo_server_port=13201,
- kumo_server_listen_port=13202,
- kumo_gateway_port=13301,
)
@@ -75,7 +70,7 @@ class Recipe(BaseSlapRecipe):
self.installTestCertificateAuthority()
self.installCertificateAuthority()
self.installMemcached(ip=self.getLocalIPv4Address(), port=11000)
- self.installKumo()
+ self.installKumo(self.getLocalIPv4Address())
self.installConversionServer(self.getLocalIPv4Address(), 23000, 23060)
self.installMysqlServer()
self.installERP5()
@@ -114,9 +109,9 @@ class Recipe(BaseSlapRecipe):
self.logger.debug('Created link %r -> %r' % (link, target))
self.path_list.append(link)
- def installKumo(self):
- ip = self.getLocalIPv4Address()
- CONFIG.update(
+ def installKumo(self, ip, kumo_manager_port=13101, kumo_server_port=13201,
+ kumo_server_listen_port=13202, kumo_gateway_port=13301):
+ config = dict(
kumo_gateway_binary=self.options['kumo_gateway_binary'],
kumo_gateway_ip=ip,
kumo_gateway_log=os.path.join(self.log_directory, "kumo-gateway.log"),
@@ -127,23 +122,27 @@ class Recipe(BaseSlapRecipe):
kumo_server_ip=ip,
kumo_server_log=os.path.join(self.log_directory, "kumo-server.log"),
kumo_server_storage=os.path.join(self.data_root_directory, "kumodb.tch"),
+ kumo_manager_port=kumo_manager_port,
+ kumo_server_port=kumo_server_port,
+ kumo_server_listen_port=kumo_server_listen_port,
+ kumo_gateway_port=kumo_gateway_port
)
self.path_list.append(self.createRunningWrapper('kumo_gateway',
self.substituteTemplate(self.getTemplateFilename('kumo_gateway.in'),
- CONFIG)))
+ config)))
self.path_list.append(self.createRunningWrapper('kumo_manager',
self.substituteTemplate(self.getTemplateFilename('kumo_manager.in'),
- CONFIG)))
+ config)))
self.path_list.append(self.createRunningWrapper('kumo_server',
self.substituteTemplate(self.getTemplateFilename('kumo_server.in'),
- CONFIG)))
+ config)))
self.connection_dict.update(
- kumo_address = '%s:%s' % (CONFIG['kumo_gateway_ip'],
- CONFIG['kumo_gateway_port'])
+ kumo_address = '%s:%s' % (config['kumo_gateway_ip'],
+ config['kumo_gateway_port'])
)
def installMemcached(self, ip, port):
--
2.30.9