bt: debugging

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

diff --git a/update-web-status.py b/update-web-status.py
index 8aa58e1..e5ff141 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:
@@ -89,13 +90,13 @@ xmpp_msg_lastmsg = ""
 action_by = ""
 xmpp_firstmsg = True
 
-def sendXmppMsg(recipients, msg, resource = "torwaechter", addtimestamp = True, noofflinemsg = False):
+def sendXmppMsg(recipients, msg, resource = "torwaechter", addtimestamp = True, noofflinemsg = False, ptimeout = 20.0, pcheckint = 0.5):
   if type(recipients) == types.ListType:
     recipients = " ".join(recipients)
   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
   
@@ -113,10 +114,28 @@ def sendXmppMsg(recipients, msg, resource = "torwaechter", addtimestamp = True,
   try:
     sppoo = subprocess.Popen(sendxmpp_cmd, stdin=subprocess.PIPE, shell=True)
     sppoo.communicate(input=msg)
-    sppoo.wait()
+    timeout_counter=ptimeout
+    while timeout_counter > 0:
+      time.sleep(pcheckint)
+      timeout_counter -= pcheckint
+      if not sppoo.poll() is None:
+        logging.debug("XMPPmessage sent: '%s'"  % msg)
+        return
+    #timeout reached
+    logging.error("sendxmpp 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("sendxmpp subprocess still alive, sending SIGKILL to pid %d" % (sppoo.pid))
+      if sys.hexversion >= 0x020600F0:
+        sppoo.kill()
+      else:
+        subprocess.call(["kill","-9",str(sppoo.pid)])
   except Exception, e:
-    logging.error(str(e))
-  logging.debug("XMPPmessage sent: '%s'"  % msg)
+    logging.error("sendXmppMsg: "+str(e))
   
 def distributeXmppMsg(msg,high_priority=False):
   global xmpp_firstmsg, xmpp_msg_lastmsg
@@ -136,7 +155,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)
@@ -214,7 +233,7 @@ while 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: