rename parsers, better journald integration

diff --git a/logparse/interface.py b/logparse/interface.py
index 770640e30baff9a7d9c552b8140f23dca147569f..46c5aeaac765da942b3cd0cc1b5b20198c724d7c 100644 (file)
--- a/logparse/interface.py
+++ b/logparse/interface.py
@@ -1,5 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+
 """
 This module is the entrypoint of the `logparse` shell command and also contains
 single-use functions which don't fit elsewhere. All user interaction with
@@ -11,15 +12,17 @@ This module provides the following methods:
     - `rotate_sim()`:   Simulate log rotation
 """
 
-import logging, logging.handlers
 import argparse
+from copy import copy
+import logging
+import logging.handlers
 import os
-from sys import stdin, version
+from sys import exit, stdin, version
 from subprocess import check_output
 from datetime import datetime
 
 import logparse
-from logparse import formatting, mail, config, load_parsers
+from logparse import formatting, mail, config, load_parsers, util
 
 
 def main():
@@ -40,24 +43,18 @@ def main():
                 argparser.parse_args().time_period)
     
     # Set up logging
-
     logger = logging.getLogger(__name__)
-    loghandler = logging.handlers.SysLogHandler(address = '/dev/log')
-    loghandler.setFormatter(logging.Formatter(
-        fmt='logparse[' + str(os.getpid()) + ']: %(message)s'))
-    loghandler.setLevel(logging.INFO)   # don't spam syslog with debug messages
-
     if (argparser.parse_args().quiet
             or config.prefs.getboolean("logparse", "quiet")):
-        logging.basicConfig(level=logging.CRITICAL)
+        logparse.logger.setLevel(logging.CRITICAL)
     elif (argparser.parse_args().verbose 
             or config.prefs.getboolean("logparse", "verbose")):
-        logging.basicConfig(level=logging.DEBUG)
+        logparse.logger.setLevel(logging.DEBUG)
         logger.debug("Verbose mode turned on")
     else:
-        logging.basicConfig(level=logging.INFO)
+        logparse.logger.setLevel(logging.INFO)
+
 
-    logger.addHandler(loghandler)
 
     # Time analysis
 
@@ -97,6 +94,12 @@ def main():
     # Set up parsers
 
     loader = load_parsers.ParserLoader()
+
+    try:
+        loader.check_systemd()
+    except Exception as e:
+        logger.error("Failed to check systemd dependencies: ".format(e))
+
     if parser_names:
         for parser_name in parser_names:
             if parser_name not in ignore_logs:
@@ -108,8 +111,23 @@ def main():
 
     # Execute parsers
 
+    executed_parsers = []
+
     for parser in loader.parsers:
-        output.append_section(parser.parse_log())
+        if (argparser.parse_args().verbose 
+                or config.prefs.getboolean("logparse", "verbose")):
+            output.append_section(parser.parse_log())
+
+        else:
+            try:
+                output.append_section(parser.parse_log())
+            except Exception as e:
+                logger.error("Uncaught error executing logger {0}: {1}".format(
+                    parser.name, e))
+        executed_parsers.append(parser.name)
+
+    if len(executed_parsers) == 0:
+        exit()
 
     # Write footer
     output.append_footer()
@@ -216,6 +234,7 @@ def main():
 
     return
 
+
 def get_argparser():
     """
     Initialise arguments (in a separate function for documentation purposes)