Changeset 10256 for mirror/edenwall

Timestamp:

04/06/09 17:23:05 (16 months ago)

Author:

romain

svm:headrev:

c624a6cb-57d4-0310-9736-a25a8df6d016:18258

svk:copy_cache_prev:

10255

Message:

applied patch from Philippe Pujas.

This patch is for ulog_rotate.py in nulog package. When starting users_1
and ulog_1 SQL tables don't exist and the script crashes.

Files:

• mirror/edenwall/nulog2/branches/2.0/scripts/ulog_rotate.py (modified) (2 diffs)

mirror/edenwall/nulog2/branches/2.0/scripts/ulog_rotate.py

@@ -109 +109 @@
 
     def __table_exists(self, table):
+        try:
+            self.cursor.execute("""SHOW TABLES LIKE '%s'""" % table)
+            return self.cursor.fetchone()!=None
+        except _mysql_exceptions.ProgrammingError, e:
+            self.debug(e)
+            return False
 
+    def __table_creates(self, table, pattern):
         try:
-            self.cursor.execute('select id from %s_1 limit 1' % self.ulog)
+            self.cursor.execute("CREATE TABLE IF NOT EXISTS `%s` LIKE `%s`" % (table, pattern))
             return True
         except _mysql_exceptions.ProgrammingError, e:
@@ -119 +126 @@
     def daily_rotate(self, table, timestamp):
 
-        if not self.__table_exists(table):
+        if not self.__table_exists(table+"_1") and not self.__table_creates(table+"_1",table):
             return
         self.cursor.execute("""INSERT INTO %s_1