writing disk usage now depends on logrotate config

diff --git a/logparse.py b/logparse.py
index 890680226ac455ac793a3cb21a28231013694ae6..896e7640023a086e1c0f6fa697f8bbfbbe748de4 100755 (executable)
--- a/logparse.py
+++ b/logparse.py
@@ -45,7 +45,7 @@ config = {
         'sys': '/var/log/syslog',
         'smb': '/var/log/samba',
         'zfs': '/var/log/zpool.log',
         'sys': '/var/log/syslog',
         'smb': '/var/log/samba',
         'zfs': '/var/log/zpool.log',

-        'alloc': '/tmp/alloc',
+        'alloc': '/var/log/du.log',

         'postfix': '/var/log/mail.log',
         'httpd': '/var/log/apache2'
     }
         'postfix': '/var/log/mail.log',
         'httpd': '/var/log/apache2'
     }


@@ -126,7 +126,7 @@ def __main__():
         closetag(tag, 1)
     tempfile.close()
     mailprep(config['output'], MAILPATH)
         closetag(tag, 1)
     tempfile.close()
     mailprep(config['output'], MAILPATH)

-    if (config['mail']['to'] != None):
+    if (config['mail']['to']):

         logger.debug("sending email")
         ms = subject(config['mail']['subject'])
         cmd = "/bin/cat " + MAILPATH + " | /usr/bin/mail --debug-level=10 -a 'Content-type: text/html' -s '" + ms + "' " + config['mail']['to']
         logger.debug("sending email")
         ms = subject(config['mail']['subject'])
         cmd = "/bin/cat " + MAILPATH + " | /usr/bin/mail --debug-level=10 -a 'Content-type: text/html' -s '" + ms + "' " + config['mail']['to']


@@ -765,7 +765,8 @@ def du():
         else:
             out.append([p, "used " + parsesize(alloc_f), "delta " + parsesize(delta)])
         contentnew += (p + '\t' + str(alloc_f) + '\n')
         else:
             out.append([p, "used " + parsesize(alloc_f), "delta " + parsesize(delta)])
         contentnew += (p + '\t' + str(alloc_f) + '\n')

-    writelog('alloc', contentnew)
+    if config['rotate'] == 'y':
+        writelog('alloc', contentnew) 

 
     writetitle("du")
     logger.debug("disk usage data is " + str(out))
 
     writetitle("du")
     logger.debug("disk usage data is " + str(out))