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']
# Mail logging handler
def sendeMail(subject, text, receivers, sender='sphinx@hacksaar.de', replyTo=None):
if not isinstance(type(receivers), list): receivers = [receivers]
# 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()
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)
# syslog
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()