[Erp5-report] r45780 luke - /erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/

[nobody at svn.erp5.org]

Author: luke
Date: Mon May  2 18:51:50 2011
New Revision: 45780

URL: http://svn.erp5.org?rev=45780&view=rev
Log:
Use directory to separate filestorages.

Modified:
    erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py

Modified: erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py?rev=45780&r1=45779&r2=45780&view=diff
==============================================================================
--- erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py [utf8] (original)
+++ erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py [utf8] Mon May  2 18:51:50 2011
@@ -506,6 +506,8 @@ class Recipe(BaseSlapRecipe):
     zeo_number = 0
     for zeo_server in sorted(self._zeo_storage_dict.iterkeys()):
       zeo_number += 1
+      server_dir = os.path.join(zodb_dir, str(zeo_number))
+      self._createDirectory(server_dir)
       zeo_event_log = os.path.join(self.log_directory, 'zeo-%s.log'% zeo_number)
       zeo_pid = os.path.join(self.run_directory, 'zeo-%s.pid'% zeo_number)
       self.registerLogRotation('zeo', [zeo_event_log],
@@ -520,8 +522,7 @@ class Recipe(BaseSlapRecipe):
       storage_definition_list = []
       for storage_name in sorted(self._zeo_storage_dict[zeo_server]):
         storage_number += 1
-        path = os.path.join(zodb_dir, 'zodb_%s_%s.fs' % (zeo_number,
-          storage_number))
+        path = os.path.join(server_dir, 'zodb_%s.fs' % storage_number)
         storage_definition_list.append("""<filestorage %(storage_name)s>
   path %(path)s
 </filestorage>"""% dict(storage_name=storage_name, path=path))