better log formatting and limit lines to 80 char

diff --git a/logparse/util.py b/logparse/util.py
index e6d905c442a17e78244f055717df98317e05c10e..f1e2aa5d6bcf7c9e2d36678387d8675370e5d3b8 100644 (file)
--- a/logparse/util.py
+++ b/logparse/util.py
@@ -9,6 +9,7 @@ This module provides the following methods:
 """
 
 from datetime import datetime, timedelta
+import copy
 import ipaddress
 import logging
 import os
@@ -44,7 +45,9 @@ def getlocaldomain(): # get the parent fqdn of current server
 
     domain = socket.getfqdn().split('.', 1)
     if len(domain) != 2:
-        logger.warning("Could not get domain of this server, only hostname. Please consider updating the hostname file at {0}".format(config.prefs.get("logparse", "hostname-path")))
+        logger.warning("Could not get domain of this server, only hostname. "
+            "Please consider updating the hostname file at {0}".format(
+                config.prefs.get("logparse", "hostname-path")))
         return 'localdomain'
     else:
         return domain[-1]
@@ -102,22 +105,28 @@ def readlog(path = None, mode = 'r'):
         return 1
     else:
         if (os.path.isfile(path) is False):
-            logger.error("Log at {0} was requested but does not exist".format(path))
+            logger.error("Log at {0} was requested but does not exist"
+                    .format(path))
             return ''
         else:
             try:
                 return open(path, mode).read()
             except IOError or OSError as e:
-                logger.warning("Error reading log at {0}: {1}".format(path, e.strerror))
+                logger.warning("Error reading log at {0}: {1}"
+                        .format(path, e.strerror))
                 return 1
 
 class LogPeriod:
 
     def __init__(self, section):
         if config.prefs.get(section.split("_")[0], "period"):
-            self.startdate = datetime.now() - timeparse(config.prefs.get(section.split("_")[0], "period"))
-            logger.debug("Parsing logs for {0} since {1}".format(section, self.startdate.strftime(formatting.DATEFMT + " " + formatting.TIMEFMT)))
+            self.startdate = datetime.now() \
+                - timeparse(config.prefs.get(section.split("_")[0], "period"))
+            logger.debug("Parsing logs for {0} since {1}".format(
+                section, self.startdate.strftime(formatting.DATEFMT
+                    + " " + formatting.TIMEFMT)))
             self.unique = True
         else:
-            self.startdate = datetime.now() - timeparse(config.prefs.get("logparse", "period"))
+            self.startdate = datetime.now() \
+                - timeparse(config.prefs.get("logparse", "period"))
             self.unique = False