bugfixing - absolute paths for everything

diff --git a/logparse.py b/logparse.py
index c40b29f024391f76c80bdb738701857122dfd031..23a8ddae888d23186027c47b24d0b77693a802f1 100755 (executable)
--- a/logparse.py
+++ b/logparse.py
@@ -112,7 +112,7 @@ def __main__():
     if (to != None):
         logger.debug("sending email")
         ms = subject(config['mail']['subject'])
     if (to != None):
         logger.debug("sending email")
         ms = subject(config['mail']['subject'])

-        cmd = "cat " + MAILPATH + " | mail --debug-level=10 -a 'Content-type: text/html' -s '" + ms + "' " + to
+        cmd = "/bin/cat " + MAILPATH + " | /usr/bin/mail --debug-level=10 -a 'Content-type: text/html' -s '" + ms + "' " + to

         logger.debug(cmd)
         subprocess.call(cmd, shell=True)
         logger.info("sent email")
         logger.debug(cmd)
         subprocess.call(cmd, shell=True)
         logger.info("sent email")


@@ -508,6 +508,23 @@ def smbd():
     logger.debug("starting smbd section")
     opentag('div', 1, 'smbd', 'section')
     files = glob.glob(config['logs']['smb'] + "/log.*[!\.gz][!\.old]")    # find list of logfiles
     logger.debug("starting smbd section")
     opentag('div', 1, 'smbd', 'section')
     files = glob.glob(config['logs']['smb'] + "/log.*[!\.gz][!\.old]")    # find list of logfiles

+    # for f in files:
+
+        # file_mod_time = os.stat(f).st_mtime
+
+        # Time in seconds since epoch for time, in which logfile can be unmodified.
+        # should_time = time.time() - (30 * 60)
+
+        # Time in minutes since last modification of file
+        # last_time = (time.time() - file_mod_time)
+        # logger.debug(last_time)
+
+        # if (file_mod_time - should_time) < args.time:
+            # print "CRITICAL: {} last modified {:.2f} minutes. Threshold set to 30 minutes".format(last_time, file, last_time)
+        # else:
+
+        # if (datetime.timedelta(datetime.datetime.now() - datetime.fromtimestamp(os.path.getmtime(f))).days > 7):
+            # files.remove(f)

     logger.debug("found log files " + str(files))
     n_auths = 0         # total number of logins from all users
     sigma_auths = []    # contains users
     logger.debug("found log files " + str(files))
     n_auths = 0         # total number of logins from all users
     sigma_auths = []    # contains users


@@ -728,7 +745,7 @@ pathfilter = {"auth": config['logs']['auth'], "cron": config['logs']['cron'], "s
 pathfilter = dict((re.escape(k), v) for k, v in pathfilter.iteritems())
 pathpattern = re.compile("|".join(pathfilter.keys()))
 
 pathfilter = dict((re.escape(k), v) for k, v in pathfilter.iteritems())
 pathpattern = re.compile("|".join(pathfilter.keys()))
 

-varfilter = {"$title$": config['title'], "$date$": datenow, "$time$": timenow, "$hostname$": hostname(), "$version$": VERSION, "$css$": os.path.basename(config['css'])}
+varfilter = {"$title$": config['title'], "$date$": datenow, "$time$": timenow, "$hostname$": hostname(), "$version$": VERSION, "$css$": config['css']}

 varfilter = dict((re.escape(k), v) for k, v in varfilter.iteritems())
 varpattern = re.compile("|".join(varfilter.keys()))
 
 varfilter = dict((re.escape(k), v) for k, v in varfilter.iteritems())
 varpattern = re.compile("|".join(varfilter.keys()))
 


@@ -751,5 +768,5 @@ def loadconf(configfile):
 try:
     __main__()
 finally:
 try:
     __main__()
 finally:

-    subprocess.call("logrotate -f /etc/logrotate.conf", shell=True)
+    subprocess.call("/usr/sbin/logrotate -f /etc/logrotate.conf", shell=True)

     logger.info("rotated logfiles")
     logger.info("rotated logfiles")