Only wait for space switches while we are in StateZu

[saartuer.git] / libtuer.py

diff --git a/libtuer.py b/libtuer.py
index 613ce4eb480d5ad47bfeac87d6c19d499ed5db91..1789b90ce8c9307f22e06d9d5cdfe3623c456988 100644 (file)
--- a/libtuer.py
+++ b/libtuer.py
@@ -1,24 +1,27 @@
 import logging, logging.handlers, os, time, queue, threading, subprocess
 import traceback, smtplib
 import logging, logging.handlers, os, time, queue, threading, subprocess
 import traceback, smtplib

-from email.mime.text import MIMEText
+import email.mime.text, email.utils

 
 # Logging configuration
 syslogLevel = logging.INFO
 mailLevel   = logging.CRITICAL # must be "larger" than syslog level!
 
 # Logging configuration
 syslogLevel = logging.INFO
 mailLevel   = logging.CRITICAL # must be "larger" than syslog level!

-mailAddress = 'post+tuer'+'@'+'ralfj.de'
+mailAddress = ['post+tuer'+'@'+'ralfj.de', 'vorstand@lists.hacksaar.de']
+printLevel  = logging.DEBUG

 
 # Mail logging handler
 def sendeMail(subject, text, receivers, sender='sphinx@hacksaar.de', replyTo=None):
 
 # Mail logging handler
 def sendeMail(subject, text, receivers, sender='sphinx@hacksaar.de', replyTo=None):

-       if not isinstance(type(receivers), list): receivers = [receivers]
+       assert isinstance(receivers, list)
+       if not len(receivers): return # nothing to do

        # construct content
        # construct content

-       msg = MIMEText(text.encode('UTF-8'), 'plain', 'UTF-8')
+       msg = email.mime.text.MIMEText(text.encode('UTF-8'), 'plain', 'UTF-8')

        msg['Subject'] = subject
        msg['Subject'] = subject

+       msg['Date'] = email.utils.formatdate(localtime=True)

        msg['From'] = sender
        msg['To'] = ', '.join(receivers)
        if replyTo is not None:
                msg['Reply-To'] = replyTo
        # put into envelope and send
        msg['From'] = sender
        msg['To'] = ', '.join(receivers)
        if replyTo is not None:
                msg['Reply-To'] = replyTo
        # put into envelope and send

-       s = smtplib.SMTP('ralfj.de')
+       s = smtplib.SMTP('localhost')

        s.sendmail(sender, receivers, msg.as_string())
        s.quit()
 
        s.sendmail(sender, receivers, msg.as_string())
        s.quit()
 


@@ -26,18 +29,20 @@ def sendeMail(subject, text, receivers, sender='sphinx@hacksaar.de', replyTo=Non
 class Logger:
        def __init__ (self):
                self.syslog = logging.getLogger("tuerd")
 class Logger:
        def __init__ (self):
                self.syslog = logging.getLogger("tuerd")

-               self.syslog.setLevel(syslogLevel)
+               self.syslog.setLevel(logging.DEBUG)

                self.syslog.addHandler(logging.handlers.SysLogHandler(address = '/dev/log',
                                                                                                                facility = logging.handlers.SysLogHandler.LOG_LOCAL0))
        
        def _log (self, lvl, what):
                self.syslog.addHandler(logging.handlers.SysLogHandler(address = '/dev/log',
                                                                                                                facility = logging.handlers.SysLogHandler.LOG_LOCAL0))
        
        def _log (self, lvl, what):

-               thestr = "%s[%d]: %s" % ("osspd", os.getpid(), what)
+               thestr = "%s[%d]: %s" % ("tuerd", os.getpid(), what)

                # console log
                # console log

-               print(thestr)
+               if lvl >= printLevel:
+                       print(thestr)

                # syslog
                # syslog

-               self.syslog.log(lvl, thestr)
+               if lvl >= syslogLevel:
+                       self.syslog.log(lvl, thestr)

                # mail log
                # mail log

-               if lvl >= mailLevel:
+               if lvl >= mailLevel and mailAddress is not None:

                        sendeMail('Kritischer Türfehler', what, mailAddress)
        
        def debug(self, what):
                        sendeMail('Kritischer Türfehler', what, mailAddress)
        
        def debug(self, what):


@@ -60,7 +65,7 @@ def fire_and_forget (cmd, log, prefix):
                with open("/dev/null", "w") as fnull:
                        retcode = subprocess.call(cmd, stdout=fnull, stderr=fnull)
                        if retcode is not 0:
                with open("/dev/null", "w") as fnull:
                        retcode = subprocess.call(cmd, stdout=fnull, stderr=fnull)
                        if retcode is not 0:

-                               log("%sReturn code %d at command: %s" % (prefix,retcode,str(cmd)))
+                               logger.error("%sReturn code %d at command: %s" % (prefix,retcode,str(cmd)))

        t = threading.Thread(target=_fire_and_forget)
        t.start()
 
        t = threading.Thread(target=_fire_and_forget)
        t.start()