Move create table outside trigger object

dogoncouch · Aug 24, 2017 · 9441208 · 9441208
1 parent 2668d7e
commit 9441208
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/siemstress/trigger.py b/siemstress/trigger.py
@@ -62,25 +62,6 @@ def watch_rule(self):
         if not '-' in self.tzone:
             self.tzone = '+' + self.tzone
 
-        # Create table if it doesn't exist:
-        con = mdb.connect(self.server, self.user, self.password,
-                self.database)
-        with con:
-            cur = con.cursor()
-            cur.execute('CREATE TABLE IF NOT EXISTS ' + self.rule['OutTable'] + \
-                    '(Id INT PRIMARY KEY AUTO_INCREMENT, ' + \
-                    'DateStamp TIMESTAMP, ' + \
-                    'TZone NVARCHAR(5), ' + \
-                    'SourceRule NVARCHAR(25), ' + \
-                    'Severity TINYINT UNSIGNED, ' + \
-                    'SourceTable NVARCHAR(25), ' + \
-                    'EventLimit INT, EventCount INT, ' + \
-                    'TimeInt INT, ' + \
-                    'Message NVARCHAR(1000), ' + \
-                    'SourceIDs NVARCHAR(2000))')
-            cur.close()
-        con.close()
-
         while True:
 
             # Check the rule:
@@ -149,6 +130,25 @@ def check_rule(self):
 def start_rule(server, user, password, database, rule, oneshot):
     """Initialize trigger object and start watching"""
 
+    # Create table if it doesn't exist:
+    con = mdb.connect(self.server, self.user, self.password,
+            self.database)
+    with con:
+        cur = con.cursor()
+        cur.execute('CREATE TABLE IF NOT EXISTS ' + rule['OutTable'] + \
+                '(Id INT PRIMARY KEY AUTO_INCREMENT, ' + \
+                'DateStamp TIMESTAMP, ' + \
+                'TZone NVARCHAR(5), ' + \
+                'SourceRule NVARCHAR(25), ' + \
+                'Severity TINYINT UNSIGNED, ' + \
+                'SourceTable NVARCHAR(25), ' + \
+                'EventLimit INT, EventCount INT, ' + \
+                'TimeInt INT, ' + \
+                'Message NVARCHAR(1000), ' + \
+                'SourceIDs NVARCHAR(2000))')
+        cur.close()
+    con.close()
+
     sentry = SiemTrigger(server, user, password, database, rule)
 
     if oneshot: