[Erp5-report] r45943 arnaud.fontaine - /slapos/trunk/util/slapos.tool.nosqltester_manager.e...

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Thu Jun 23 08:00:28 2011
New Revision: 45943

URL: http://svn.erp5.org?rev=45943&view=rev
Log:
Shorten lines and log any error as error level rather than debug

Modified:
    slapos/trunk/util/slapos.tool.nosqltester_manager.erp5/src/slapos/tool/nosqltester_manager/erp5/__init__.py

Modified: slapos/trunk/util/slapos.tool.nosqltester_manager.erp5/src/slapos/tool/nosqltester_manager/erp5/__init__.py
URL: http://svn.erp5.org/slapos/trunk/util/slapos.tool.nosqltester_manager.erp5/src/slapos/tool/nosqltester_manager/erp5/__init__.py?rev=45943&r1=45942&r2=45943&view=diff
==============================================================================
--- slapos/trunk/util/slapos.tool.nosqltester_manager.erp5/src/slapos/tool/nosqltester_manager/erp5/__init__.py [utf8] (original)
+++ slapos/trunk/util/slapos.tool.nosqltester_manager.erp5/src/slapos/tool/nosqltester_manager/erp5/__init__.py [utf8] Thu Jun 23 08:00:28 2011
@@ -43,43 +43,66 @@ class ERP5ScalabilityTesterManager(NoSQL
 
   def _erp5_init(self):
     try:
-      tester_computer_partition = []
+      partition_list = []
       for i in range(0, self.nb_tester_init):
         self.logger.debug("EPR5 tester "+str(i))
-        tester_computer_partition.append(self.computer_partition.request(self.software_release_url, 'erp5_tester', 'erp5_tester'+str(i),
-                   partition_parameter_kw={'host_address':self.host_address,
-                                           'erp5_url':self.computer_partition.getConnectionParameter('erp5_url'),
-                                           'benchmark_suites':self.computer_partition.getConnectionParameter('benchmark_suites'),
-                                           'repeat':self.computer_partition.getConnectionParameter('repeat'),
-                                           'nb_users':self.computer_partition.getConnectionParameter('nb_users')}))
-      for partition in tester_computer_partition:
+
+        partition_parameter_kw = {
+          'host_address': self.host_address,
+          'erp5_url': self.computer_partition.getConnectionParameter('erp5_url'),
+          'benchmark_suites': self.computer_partition.getConnectionParameter('benchmark_suites'),
+          'repeat': self.computer_partition.getConnectionParameter('repeat'),
+          'nb_users': self.computer_partition.getConnectionParameter('nb_users')}
+
+        partition = self.computer_partition.request(self.software_release_url,
+                                                    'erp5_tester',
+                                                    'erp5_tester' + str(i),
+                                                    partition_parameter_kw=partition_parameter_kw)
+
+        partition_list.append(partition)
+
+      for partition in partition_list:
         self.logger.debug("Appending ERP5 testers' url")
         self.tester_urls.append(partition.getConnectionParameter('url'))
+
       self.logger.debug("Before remove duplicates: %s" % str(self.tester_urls))
       self.tester_urls = list(set(self.tester_urls)) # remove duplicates
       self.logger.debug("After remove duplicates: %s" % str(self.tester_urls))
+
       return True
+
     except:
-      self.logger.debug(str(sys.exc_info()))
+      self.logger.error(str(sys.exc_info()))
       return False
 
   def _add_erp5_tester_node(self):
     try:
-      tester_computer_partition = []
+      partition_list = []
       for i in range(0, self.node_increment):
-        tester_computer_partition.append(self.computer_partition.request(self.software_release_url, 'erp5_tester', 'erp5_tester'+str(i),
-                   partition_parameter_kw={'host_address':self.host_address,
-                                           'erp5_url':self.computer_partition.getConnectionParameter('erp5_url'),
-                                           'benchmark_suites':self.computer_partition.getConnectionParameter('benchmark_suites'),
-                                           'repeat':self.computer_partition.getConnectionParameter('repeat'),
-                                           'nb_users':self.computer_partition.getConnectionParameter('nb_users')}))
-      for partition in tester_computer_partition:
+        partition_parameter_kw = {
+          'host_address': self.host_address,
+          'erp5_url': self.computer_partition.getConnectionParameter('erp5_url'),
+          'benchmark_suites': self.computer_partition.getConnectionParameter('benchmark_suites'),
+          'repeat': self.computer_partition.getConnectionParameter('repeat'),
+          'nb_users': self.computer_partition.getConnectionParameter('nb_users')}
+
+        partition = self.computer_partition.request(self.software_release_url,
+                                                    'erp5_tester',
+                                                    'erp5_tester'+str(i),
+                                                    partition_parameter_kw=partition_parameter_kw)
+
+        partition_list.append(partition)
+
+      for partition in partition_list:
         self.logger.debug("Appending ERP5 testers' url")
         self.tester_urls.append(partition.getConnectionParameter('url'))
+
       self.logger.debug("Before remove duplicates: %s" % str(self.tester_urls))
       self.tester_urls = list(set(self.tester_urls)) # remove duplicates
       self.logger.debug("After remove duplicates: %s" % str(self.tester_urls))
+
       return True
+
     except:
-      self.logger.debug(str(sys.exc_info()))
+      self.logger.error(str(sys.exc_info()))
       return False