refactoring

[logalert.git] / src / logalert.py

diff --git a/src/logalert.py b/src/logalert.py
index 509b24655197c6c75db861612de69341cfc91fd4..e2f02ccbd40f53c8a763f6d2435778374f9566f0 100755 (executable)
--- a/src/logalert.py
+++ b/src/logalert.py
@@ -2,58 +2,13 @@
 
 import argparse
 import logging
 
 import argparse
 import logging

-import os
-import shlex
-import subprocess

 import time
 
 import time
 

-from line import Line
+import misc

 
 MAX_LINES = 10
 ALERT_INTERVAL = 86400
 
 
 MAX_LINES = 10
 ALERT_INTERVAL = 86400
 

-def follow(filename):
-    while True:
-        try:
-            with open(filename, "r") as f:
-                logging.info("Re-attached to log file.")
-                for line in f: pass
-                while True:
-                    line = f.readline()
-                    if not line:
-                        if not os.path.exists(filename):
-                            break
-                        else:
-                            time.sleep(1.0)
-                            yield None
-                    else:
-                        yield line.rstrip("\n")
-        except FileNotFoundError:
-            time.sleep(1.0)
-            yield None
-
-def feed_handler(data):
-    try:
-        handler = subprocess.Popen(shlex.split(args.handler),
-                                   stdin=subprocess.PIPE,
-                                   stdout=subprocess.PIPE,
-                                   stderr=subprocess.PIPE,
-                                   encoding='UTF-8')
-        out_data, err_data = handler.communicate("%s\n" % data)
-        if handler.returncode != 0:
-            logging.warning("Handler exited with non-zero return code %d! (%s)" %
-                            (handler.returncode, err_data))
-    except Exception as e:
-        logging.error("Error feeding handler: %s" % str(e))
-
-def create_msg(title, icon, logfile, text, lines):
-    msg = "<b>%s</b> <i>%s</i> %s" % (title, logfile, icon)
-    msg += "<br>%s" % text
-    msg += "<br><pre>"
-    for line in lines: msg += line + "\n"
-    msg += "</pre>"
-    return msg
-

 logging.basicConfig(format='[%(asctime)s] %(levelname)s: %(message)s',
                     level=logging.INFO,
                     datefmt='%m/%d/%Y %H:%M:%S')
 logging.basicConfig(format='[%(asctime)s] %(levelname)s: %(message)s',
                     level=logging.INFO,
                     datefmt='%m/%d/%Y %H:%M:%S')


@@ -75,7 +30,7 @@ last_slot_time = None
 error_state = False
 last_alert_time = 0
 
 error_state = False
 last_alert_time = 0
 

-for line in follow(args.logfile):
+for line in misc.follow_file(args.logfile):

     time_now = time.time()
     slot_now = int(time_now) // args.interval_size
 
     time_now = time.time()
     slot_now = int(time_now) // args.interval_size
 


@@ -100,11 +55,12 @@ for line in follow(args.logfile):
     if not False in intervals[1:]:
         if not error_state or time_now - last_alert_time > ALERT_INTERVAL:
             last_alert_time = time_now
     if not False in intervals[1:]:
         if not error_state or time_now - last_alert_time > ALERT_INTERVAL:
             last_alert_time = time_now

-            feed_handler( create_msg("Log Alert",
-                                     "&#9760;",
-                                     args.logfile,
-                                     "Number of errors exceeded!",
-                                     lines) )
+            misc.feed_handler( args.handler,
+                               misc.create_msg("Log Alert",
+                                               "&#9760;",
+                                               args.logfile,
+                                               "Number of errors exceeded!",
+                                               lines) )

         if not error_state:
             logging.warning("Entering error state!")
             error_state = True
         if not error_state:
             logging.warning("Entering error state!")
             error_state = True


@@ -113,8 +69,3 @@ for line in follow(args.logfile):
         if error_state:
             logging.info("Leaving error state.")
             error_state = False
         if error_state:
             logging.info("Leaving error state.")
             error_state = False

-            feed_handler( create_msg("Log Un-Alert",
-                                     "&#127774;",
-                                     args.logfile,
-                                     "Log is back to normal.",
-                                     lines) )