projects
/
saartuer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only wait for space switches while we are in StateZu
[saartuer.git]
/
libtuer.py
diff --git
a/libtuer.py
b/libtuer.py
index afef36e9b261981fb8359af2e0b3de85c6600f89..1789b90ce8c9307f22e06d9d5cdfe3623c456988 100644
(file)
--- a/
libtuer.py
+++ b/
libtuer.py
@@
-1,15
+1,17
@@
import logging, logging.handlers, os, time, queue, threading, subprocess
import traceback, smtplib
import logging, logging.handlers, os, time, queue, threading, subprocess
import traceback, smtplib
-import email.mime.text, email.util
+import email.mime.text, email.util
s
# 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
msg = email.mime.text.MIMEText(text.encode('UTF-8'), 'plain', 'UTF-8')
msg['Subject'] = subject
# construct content
msg = email.mime.text.MIMEText(text.encode('UTF-8'), 'plain', 'UTF-8')
msg['Subject'] = subject
@@
-18,9
+20,8
@@
def sendeMail(subject, text, receivers, sender='sphinx@hacksaar.de', replyTo=Non
msg['To'] = ', '.join(receivers)
if replyTo is not None:
msg['Reply-To'] = replyTo
msg['To'] = ', '.join(receivers)
if replyTo is not None:
msg['Reply-To'] = replyTo
- # FIXME set time
# put into envelope and send
# 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()
@@
-28,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" % ("
ossp
d", os.getpid(), what)
+ thestr = "%s[%d]: %s" % ("
tuer
d", 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):
@@
-62,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)))
+ 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()