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

[nobody at svn.erp5.org]

Author: luke
Date: Fri Apr 22 11:59:33 2011
New Revision: 45635

URL: http://svn.erp5.org?rev=45635&view=rev
Log:
 - register mysql log rotation

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=45635&r1=45634&r2=45635&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] Fri Apr 22 11:59:33 2011
@@ -598,6 +598,8 @@ SSLRandomSeed connect builtin
 
   def installMysqlServer(self, ip, port, database='erp5', user='user',
       test_database='test_erp5', test_user='test_user'):
+    error_log = os.path.join(self.log_directory, 'mysqld.log')
+    slow_query_log = os.path.join(self.log_directory, 'mysql-slow.log')
     mysql_conf = dict(
         ip=ip,
         data_directory=os.path.join(self.data_root_directory,
@@ -605,9 +607,8 @@ SSLRandomSeed connect builtin
         tcp_port=port,
         pid_file=os.path.join(self.run_directory, 'mysqld.pid'),
         socket=os.path.join(self.run_directory, 'mysqld.sock'),
-        error_log=os.path.join(self.log_directory, 'mysqld.log'),
-        slow_query_log=os.path.join(self.log_directory,
-        'mysql-slow.log'),
+        error_log=error_log,
+        slow_query_log=slow_query_log,
         mysql_database=database,
         mysql_user=user,
         mysql_password=self.generatePassword(),
@@ -618,6 +619,11 @@ SSLRandomSeed connect builtin
             ('test_%i' % x,)*2 + (self.generatePassword(),) \
                  for x in xrange(0,100)],
     )
+    self.registerLogRotation('mysql', [error_log, slow_query_log],
+        '%(mysql_binary)s --no-defaults -B --user=root '
+        '--socket=%(mysql_socket)s -e "FLUSH LOGS"' % dict(
+          mysql_binary=self.options['mysql_binary'],
+          mysql_socket=mysql_conf['socket']))
     self._createDirectory(mysql_conf['data_directory'])
 
     mysql_conf_path = self.createConfigurationFile("my.cnf",