updated new log messges to better fit the situation

[svn42.git] / update-web-status.py

diff --git a/update-web-status.py b/update-web-status.py
index 4776e6a..0891ebc 100755 (executable)
--- a/update-web-status.py
+++ b/update-web-status.py
@@ -14,12 +14,13 @@ import subprocess
 import types
 import ConfigParser
 
-#logging.basicConfig(level=logging.INFO,filename='/var/log/tmp/tuer.log',format="%(asctime)s %(message)s",datefmt="%Y-%m-%d %H:%M")
 logging.basicConfig(
-  level=logging.ERROR,  
+  level=logging.INFO,
+  #level=f,
   #level=logging.DEBUG,
+  filename='/var/log/tmp/update-web-status.log',
   format="%(asctime)s %(message)s",
-  datefmt="%Y-%m-%d %H:%M"
+  datefmt="%Y-%m-%d %H:%M:%S"
   )
 
 class UWSConfig:
@@ -83,11 +84,60 @@ class UWSConfig:
     except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
       raise AttributeError
 
-
-
-xmpp_msg_lastmsg = ""
-action_by = ""
-xmpp_firstmsg = True
+def popenTimeout1(cmd, pinput, returncode_ok=[0], ptimeout = 20.0, pcheckint = 0.25):
+  logging.debug("popenTimeout1: starting: " + cmd)
+  try:
+    sppoo = subprocess.Popen(cmd, stdin=subprocess.PIPE, shell=True)
+    sppoo.communicate(input=pinput)
+    timeout_counter=ptimeout
+    while timeout_counter > 0:
+      time.sleep(pcheckint)
+      timeout_counter -= pcheckint
+      if not sppoo.poll() is None:
+        logging.debug("popenTimeout2: subprocess %d finished, returncode: %d" % (sppoo.pid,sppoo.returncode))
+        return (sppoo.returncode in returncode_ok)
+    #timeout reached
+    logging.error("popenTimeout1: subprocess took too long (>%fs), sending SIGTERM to pid %d" % (ptimeout,sppoo.pid))
+    if sys.hexversion >= 0x020600F0:
+      sppoo.terminate()
+    else:
+      subprocess.call(["kill",str(sppoo.pid)])
+    time.sleep(1.0)
+    if sppoo.poll() is None:
+      logging.error("popenTimeout1: subprocess still alive, sending SIGKILL to pid %d" % (sppoo.pid))
+      if sys.hexversion >= 0x020600F0:
+        sppoo.kill()
+      else:
+        subprocess.call(["kill","-9",str(sppoo.pid)])
+    return False
+  except Exception, e:
+    logging.error("popenTimeout1: "+str(e))
+    return False
+  
+def popenTimeout2(cmd, pinput, returncode_ok=[0], ptimeout=21):
+  logging.debug("popenTimeout2: starting: " + cmd)
+  try:
+    sppoo = subprocess.Popen(cmd, stdin=subprocess.PIPE, shell=True)
+    if sys.hexversion >= 0x020600F0:
+      old_shandler = signal.signal(signal.SIGALRM,lambda sn,sf: sppoo.kill())
+    else:
+      old_shandler = signal.signal(signal.SIGALRM,lambda sn,sf: os.system("kill -9 %d" % sppoo.pid))
+    signal.alarm(ptimeout) #schedule alarm
+    sppoo.communicate(input=pinput)
+    sppoo.wait()
+    signal.alarm(0) #disable pending alarms
+    signal.signal(signal.SIGALRM, old_shandler) 
+    logging.debug("popenTimeout2: subprocess %d finished, returncode: %d" % (sppoo.pid,sppoo.returncode))
+    if sppoo.returncode < 0:
+      logging.error("popenTimeout2: subprocess took too long (>%ds) and pid %d was killed" % (ptimeout,sppoo.pid))
+    return (sppoo.returncode in returncode_ok)
+  except Exception, e:
+    logging.error("popenTimeout2: "+str(e))
+    try:
+      signal.signal(signal.SIGALRM, old_shandler) 
+    except:
+      pass
+    return False
 
 def sendXmppMsg(recipients, msg, resource = "torwaechter", addtimestamp = True, noofflinemsg = False):
   if type(recipients) == types.ListType:
@@ -95,7 +145,7 @@ def sendXmppMsg(recipients, msg, resource = "torwaechter", addtimestamp = True,
   if type(recipients) == types.UnicodeType:
     recipients = recipients.decode("utf-8")
   if type(recipients) != types.StringType:
-    raise Exception("list of recipients in unknown format, can't send message")
+    raise Exception("argument recipients not a space separated string or xmpp addresses, can't send message")
   if recipients == "" or msg == "":
     return
   
@@ -109,23 +159,21 @@ def sendXmppMsg(recipients, msg, resource = "torwaechter", addtimestamp = True,
   if addtimestamp:
     msg += time.strftime(" (%Y-%m-%d %T)")
   
-  logging.debug("Starting " + sendxmpp_cmd)
-  try:
-    sppoo = subprocess.Popen(sendxmpp_cmd, stdin=subprocess.PIPE, shell=True)
-    sppoo.communicate(input=msg)
-    sppoo.wait()
-  except Exception, e:
-    logging.error(str(e))
-  logging.debug("XMPPmessage sent: '%s'"  % msg)
-  
-def distributeXmppMsg(msg):
+  popenTimeout2(sendxmpp_cmd, msg)
+
+
+xmpp_msg_lastmsg = ""
+action_by = ""
+xmpp_firstmsg = True
+
+def distributeXmppMsg(msg,high_priority=False):
   global xmpp_firstmsg, xmpp_msg_lastmsg
   if xmpp_firstmsg:
     xmpp_msg_lastmsg = msg
     xmpp_firstmsg = False
-  if msg != xmpp_msg_lastmsg:    
+  if msg != xmpp_msg_lastmsg:
     sendXmppMsg(uwscfg.xmpp_recipients_normal, msg)
-    sendXmppMsg(uwscfg.xmpp_recipients_nooffline, msg, noofflinemsg=True)
+    sendXmppMsg(uwscfg.xmpp_recipients_nooffline, msg, noofflinemsg=(not high_priority))
   else:
     sendXmppMsg(uwscfg.xmpp_recipients_debug, "D: " + msg)
   xmpp_msg_lastmsg = msg
@@ -136,7 +184,7 @@ def touchURL(url):
     f.read()
     f.close()
   except Exception, e:
-    logging.error(str(e))
+    logging.error("tochURL: "+str(e))
   
 def displayOpen():
   touchURL(uwscfg.url_open)
@@ -210,11 +258,11 @@ while True:
       if not m is None:
         errorstr = m.group(1)
         if "too long!" in errorstr:
-          distributeXmppMsg(uwscfg.xmpp_recipients_debug, "Door Error: "+errorstr)
+          distributeXmppMsg(uwscfg.xmpp_recipients_debug, "Door Error: "+errorstr, high_priority=True)
         else:
           sendXmppMsg(uwscfg.xmpp_recipients_debug, "D: Error: "+errorstr)
   except Exception, ex:
-    logging.error(str(ex)) 
+    logging.error("main: "+str(ex)) 
     try:
       conn.close()
     except: