X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/4f9482a7c46d5930b309a5796c39f81efa3989ae..fce36f5a8b88722b94b7c60266fb0fc72b2bc10c:/libtuer.py?ds=sidebyside

diff --git a/libtuer.py b/libtuer.py
index 613ce4e..835bf6d 100644
--- a/libtuer.py
+++ b/libtuer.py
@@ -1,24 +1,27 @@
 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!
-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):
-	if not isinstance(type(receivers), list): receivers = [receivers]
+	assert isinstance(receivers, list)
+	if not len(receivers): return # nothing to do
 	# 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['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
-	s = smtplib.SMTP('ralfj.de')
+	s = smtplib.SMTP('localhost')
 	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")
-		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):
-		thestr = "%s[%d]: %s" % ("osspd", os.getpid(), what)
+		thestr = "%s[%d]: %s" % ("tuerd", os.getpid(), what)
 		# console log
-		print(thestr)
+		if lvl >= printLevel:
+			print(thestr)
 		# syslog
-		self.syslog.log(lvl, thestr)
+		if lvl >= syslogLevel:
+			self.syslog.log(lvl, thestr)
 		# mail log
-		if lvl >= mailLevel:
+		if lvl >= mailLevel and mailAddress is not None:
 			sendeMail('Kritischer Türfehler', what, mailAddress)
 	
 	def debug(self, what):
@@ -53,16 +58,26 @@ class Logger:
 
 logger = Logger()
 
+# run a Python command asynchronously
+def fire_and_forget(f):
+	def _fire_and_forget():
+		try:
+			f()
+		except Exception as e:
+			logger.critical("fire_and_forget: Got exception out of callback: %s" % str(e))
+			logger.debug(traceback.format_exc())
+	t = threading.Thread(target=_fire_and_forget)
+	t.start()
+
 # run a command asynchronously and log the return value if not 0
 # prefix must be a string identifying the code position where the call came from
-def fire_and_forget (cmd, log, prefix):
-	def _fire_and_forget ():
+def fire_and_forget_cmd (cmd, log, prefix):
+	def _fire_and_forget_cmd ():
 		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)))
-	t = threading.Thread(target=_fire_and_forget)
-	t.start()
+				logger.error("%sReturn code %d at command: %s" % (prefix,retcode,str(cmd)))
+	fire_and_forget(_fire_and_forget_cmd)
 
 # Threaded callback class
 class ThreadFunction():