projects
/
saartuer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
missed a place where I had to rename open -> unlock
[saartuer.git]
/
libtuer.py
diff --git
a/libtuer.py
b/libtuer.py
index 613ce4eb480d5ad47bfeac87d6c19d499ed5db91..05607f6e8b9f5cc9cad3397e000aaa233aa77205 100644
(file)
--- a/
libtuer.py
+++ b/
libtuer.py
@@
-1,6
+1,6
@@
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.util
# Logging configuration
syslogLevel = logging.INFO
# Logging configuration
syslogLevel = logging.INFO
@@
-11,12
+11,14
@@
mailAddress = 'post+tuer'+'@'+'ralfj.de'
def sendeMail(subject, text, receivers, sender='sphinx@hacksaar.de', replyTo=None):
if not isinstance(type(receivers), list): receivers = [receivers]
# construct content
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['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
msg['From'] = sender
msg['To'] = ', '.join(receivers)
if replyTo is not None:
msg['Reply-To'] = replyTo
+ # FIXME set time
# put into envelope and send
s = smtplib.SMTP('ralfj.de')
s.sendmail(sender, receivers, msg.as_string())
# put into envelope and send
s = smtplib.SMTP('ralfj.de')
s.sendmail(sender, receivers, msg.as_string())
@@
-60,7
+62,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)))
+ log
ger.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()