Added SMTP forwarder configuration reloading

benmeier42-eng · benmeier42-eng · commit 9022396dde2c · 2013-01-25T14:24:29.000+02:00
diff --git a/warden/settings.py b/warden/settings.py
@@ -33,17 +33,6 @@
 # ---------------
 
 START_SMTP_FORWARDER = False
+SMTP_FORWARDER_CONFIG = None
 
-# Server settings
-EMAIL_HOST = 'mail.sjsoft.com'
-EMAIL_USERNAME = 'some_username_here'
-EMAIL_PASSWORD = 'some_password_here'
-EMAIL_USE_TLS = True
-
-EMAIL_TO = 'ryans@sjsoft.com'
-EMAIL_FROM = 'no-reply@sjsoft.com'
-EMAIL_SUBJECT_VALIDATION_KEY = 'j5_parsable'
-EMAIL_BODY_VALIDATION_KEY = 'CARBON_FILE_MAIL'
-
-METRIC_PATTERNS_TO_SEND = ['combined.dori-a.memUsage', 'combined.*.cpuUsage' ]
 
diff --git a/warden/smtp_forwarder/sample.smtp.conf b/warden/smtp_forwarder/sample.smtp.conf
@@ -0,0 +1,17 @@
+# MAIL SERVER
+EMAIL_HOST = 'mail.sjsoft.com'
+EMAIL_USERNAME = 'justinc@sjsoft.com'
+EMAIL_PASSWORD = 'shuphJuem9'
+EMAIL_USE_TLS = True
+EMAIL_FROM = 'no-reply@sjsoft.com'
+
+# MAIL TARGET
+EMAIL_TO = 'benm@sjsoft.com'
+EMAIL_SUBJECT_VALIDATION_KEY = 'j5_parsable'
+EMAIL_BODY_VALIDATION_KEY = 'CARBON_FILE_MAIL'
+
+# METRICS TO SEND
+METRIC_PATTERNS_TO_SEND = 'dori-a.memUsage', 'combined.*.cpuUsage'
+
+# EVERY x SECONDS
+SEND_INTERVAL = 30
diff --git a/warden/warden_smtp_forwarder.py b/warden/warden_smtp_forwarder.py
@@ -16,7 +16,6 @@ def __init__(self, config_file):
 
         config_file = os.path.expandvars(os.path.expanduser(config_file))
 
-
         self.dispatcherThread = self.CentralDispatcherThread(config_file)
 
     def start(self):
@@ -34,9 +33,7 @@ class CentralDispatcherThread(threading.Thread):
         def __init__(self, config_file):
             threading.Thread.__init__(self)
             self.running = False
-            self.configuration = ConfigObj(config_file)
-
-            self.configuration['METRIC_PATTERNS_TO_SEND'] = self.compile_metric_patterns(self.configuration['METRIC_PATTERNS_TO_SEND'])
+            self.config_file = config_file
 
         def compile_metric_patterns(self, old_patterns):
 
@@ -52,6 +49,10 @@ def compile_metric_patterns(self, old_patterns):
 
         def run(self):
             self.running = True
+
+            self.configuration = ConfigObj(self.config_file)
+            self.configuration['METRIC_PATTERNS_TO_SEND'] = self.compile_metric_patterns(self.configuration['METRIC_PATTERNS_TO_SEND'])
+
             self.SLEEP_TIME = int(self.configuration['SEND_INTERVAL'])
             self.last_poll_time = time.time()
 
@@ -60,6 +61,9 @@ def run(self):
                     time.sleep(1)
                     continue
 
+                self.configuration = ConfigObj(self.config_file)
+                self.configuration['METRIC_PATTERNS_TO_SEND'] = self.compile_metric_patterns(self.configuration['METRIC_PATTERNS_TO_SEND'])
+
                 conn = SMTP()
                 try:
                     log.debug('Connecting...')
