X-Git-Url: https://git.realraum.at/?p=svn42.git;a=blobdiff_plain;f=update-xmpp-status.py;h=74283f10d6b1ec63da439f72b2336d94a099e1f4;hp=116db8240f7db4d8dde73ac0b2638c62b7c90c49;hb=9b57ad36fa772a94f8f38321a88f2b1df1818a51;hpb=d263eec6d21cd566c06b2f1038cdce967c7cf8a8

diff --git a/update-xmpp-status.py b/update-xmpp-status.py
old mode 100644
new mode 100755
index 116db82..74283f1
--- a/update-xmpp-status.py
+++ b/update-xmpp-status.py
@@ -1,9 +1,9 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
+from __future__ import with_statement
 import os
 import os.path
 import sys
-#import threading
 import logging
 import logging.handlers
 import urllib
@@ -14,6 +14,14 @@ import socket
 import subprocess
 import types
 import ConfigParser
+import traceback
+import threading
+try:
+  import MySQLdb
+  import_mysql_ok=True
+except:
+  import_mysql_ok=False
+  pass
 
 logger = logging.getLogger()
 logger.setLevel(logging.INFO)
@@ -26,14 +34,42 @@ logger.addHandler(lh_stderr)
 
 class UWSConfig:
   def __init__(self,configfile=None):
+    #Synchronisation
+    self.lock=threading.Lock()
+    self.finished_reading=threading.Condition(self.lock)
+    self.finished_writing=threading.Condition(self.lock)
+    self.currently_reading=0
+    self.currently_writing=False
+    #MySQL
+    self.dbconn=None
+    #Config Data    
     self.configfile=configfile
     self.config_parser=ConfigParser.ConfigParser()
+    self.config_parser.add_section('mysql')
+    self.config_parser.set('mysql','host','')
+    self.config_parser.set('mysql','user','')
+    self.config_parser.set('mysql','pwd','')
+    self.config_parser.set('mysql','db','')
     self.config_parser.add_section('xmpp')
     self.config_parser.set('xmpp','recipients_debug','xro@jabber.tittelbach.at')
     self.config_parser.set('xmpp','recipients_normal','xro@jabber.tittelbach.at otti@wirdorange.org')
-    self.config_parser.set('xmpp','recipients_nooffline','the-equinox@jabber.org')
-    self.config_parser.set('xmpp','msg_opened',"Realraum Tür wurde%s geöffnet")
-    self.config_parser.set('xmpp','msg_closed',"Realraum Tür wurde%s geschlossen")
+    self.config_parser.set('xmpp','recipients_nooffline','the-equinox@jabber.org davrieb@jabber.ccc.de')
+    self.config_parser.add_section('msg')
+    self.config_parser.set('msg','bored',"The Button has been pressed ! Maybe somebody want's company. Go Visit !")
+    self.config_parser.set('msg','present',"Somebodys presence has been detected${door_action_msg}")
+    self.config_parser.set('msg','notpresent',"Nobody seems to be here, guess everybody left${door_action_msg}")
+    self.config_parser.set('msg','door_action_msg',", door last ${door_status} ${by_whom}")
+    self.config_parser.set('msg','status_error_msg',"ERROR Last Operation took too long !!!")
+    self.config_parser.add_section('cam')
+#    self.config_parser.set('cam','freeze_url',"http://www.realraum.at/cgi/freeze_realraum_picture.pl?freeze=98VB9s")        
+#    self.config_parser.set('cam','picture_url',"http://www.realraum.at/cgi/freeze_realraum_picture.pl") 
+    self.config_parser.set('cam','provide_pic',"True")
+    self.config_parser.set('cam','freeze_url',"https://www.tittelbach.at/realraum_pic.php?freeze=98VB9s")
+    self.config_parser.set('cam','picture_url',"https://www.tittelbach.at/realraum_pic.php")
+    self.config_parser.add_section('tracker')
+    self.config_parser.set('tracker','socket',"/var/run/tuer/presence.socket")
+    self.config_parser.add_section('debug')
+    self.config_parser.set('debug','enabled',"False")
     self.config_mtime=0
     if not self.configfile is None:
       try:
@@ -41,29 +77,63 @@ class UWSConfig:
         cf_handle.close()
       except IOError:
         self.writeConfigFile()
+        self.initMysqlConn()
       else:
         self.checkConfigUpdates()
     
+  def guardReading(self):
+    with self.lock:
+      while self.currently_writing:
+        self.finished_writing.wait()
+      self.currently_reading+=1
+
+  def unguardReading(self):
+    with self.lock:
+      self.currently_reading-=1
+      self.finished_reading.notifyAll()
+      
+  def guardWriting(self):
+    with self.lock:
+      self.currently_writing=True
+      while self.currently_reading > 0:
+        self.finished_reading.wait()
+    
+  def unguardWriting(self):
+    with self.lock:
+      self.currently_writing=False
+      self.finished_writing.notifyAll()
+    
   def checkConfigUpdates(self):
+    global logger
     if self.configfile is None:
       return
     logging.debug("Checking Configfile mtime: "+self.configfile)
     try:
       mtime = os.path.getmtime(self.configfile)
-    except IOError:
+    except (IOError,OSError):
       return
     if self.config_mtime < mtime:
       logging.debug("Reading Configfile")
+      self.guardWriting()
       try:
         self.config_parser.read(self.configfile)
         self.config_mtime=os.path.getmtime(self.configfile)
-      except ConfigParser.ParsingError, pe_ex:
+      except (ConfigParser.ParsingError, IOError), pe_ex:
         logging.error("Error parsing Configfile: "+str(pe_ex))
+      self.unguardWriting()
+      self.guardReading()
+      if self.config_parser.get('debug','enabled') == "True":
+        logger.setLevel(logging.DEBUG)
+      else:
+        logger.setLevel(logging.INFO)
+      self.initMysqlConn()
+      self.unguardReading()
 
   def writeConfigFile(self):
     if self.configfile is None:
       return
-    logging.debug("Writing Configfile "+self.configfile)      
+    logging.debug("Writing Configfile "+self.configfile)
+    self.guardReading()
     try:
       cf_handle = open(self.configfile,"w")
       self.config_parser.write(cf_handle)
@@ -72,15 +142,65 @@ class UWSConfig:
     except IOError, io_ex:
       logging.error("Error writing Configfile: "+str(io_ex))
       self.configfile=None
+    self.unguardReading()
 
   def __getattr__(self, name):
     underscore_pos=name.find('_')
     if underscore_pos < 0:
       raise AttributeError
+    rv=None
+    self.guardReading()
     try:
-      return self.config_parser.get(name[0:underscore_pos], name[underscore_pos+1:])
+      rv = self.config_parser.get(name[0:underscore_pos], name[underscore_pos+1:])
     except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
+      self.unguardReading()
       raise AttributeError
+    self.unguardReading()
+    if rv[0:5] == "SQL: ":
+      return self.returnSqlStatementResult(rv[6:])
+    else:
+      return rv
+    
+  def initMysqlConn(self):
+    global import_mysql_ok
+    if not import_mysql_ok:
+      return
+    host=self.config_parser.get("mysql", "host")
+    user=self.config_parser.get("mysql", "user")
+    pwd=self.config_parser.get("mysql", "pwd")
+    db=self.config_parser.get("mysql", "db")
+    if host != "" and user != "" and pwd != "" and db != "" and self.dbconn is None:
+      try:
+        dbconn = MySQLdb.connect (host = host,  user = user,  passwd = pwd,  db = db)
+        self.dbconn=dbconn
+      except MySQLdb.Error, e:
+        logging.error("Error connecting to MySql Database: %d: %s" % (e.args[0], e.args[1]))
+  
+  def returnSqlStatementResult(self, statement):
+    if self.dbconn is None:
+      return ""
+    cursor = self.dbconn.cursor()
+    try:
+      cursor.execute(statement)
+      results = cursor.fetchall()
+      res_str = " ".join(map(lambda row: row[0], results))
+      logging.debug("UWSCfg: mysql resulst: "+res_str)
+      cursor.close()
+      return res_str
+    except:
+      logging.error("UWSCfg: Mysql Stmt failed: " + statement)
+      traceback.print_exc(file=sys.stdout)
+      return ""
+
+def touchURL(url):
+  try:
+    f = urllib.urlopen(url)
+    rq_response = f.read()
+    logging.debug("touchURL: Response "+rq_response)
+    f.close()
+    return rq_response
+  except Exception, e:
+    logging.error("touchURL: "+str(e))
 
 def popenTimeout1(cmd, pinput, returncode_ok=[0], ptimeout = 20.0, pcheckint = 0.25):
   logging.debug("popenTimeout1: starting: " + cmd)
@@ -113,6 +233,7 @@ def popenTimeout1(cmd, pinput, returncode_ok=[0], ptimeout = 20.0, pcheckint = 0
     return False
   
 def popenTimeout2(cmd, pinput, returncode_ok=[0], ptimeout=21):
+  global sppoo
   logging.debug("popenTimeout2: starting: " + cmd)
   try:
     sppoo = subprocess.Popen(cmd, stdin=subprocess.PIPE, shell=True)
@@ -159,40 +280,54 @@ def sendXmppMsg(recipients, msg, resource = "torwaechter", addtimestamp = True,
   
   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:
+def distributeXmppMsg(msg,high_priority=False,debug=False):
+  if debug == False:
     sendXmppMsg(uwscfg.xmpp_recipients_normal, msg)
     sendXmppMsg(uwscfg.xmpp_recipients_nooffline, msg, noofflinemsg=(not high_priority))
   else:
     sendXmppMsg(uwscfg.xmpp_recipients_debug, "D: " + msg)
-  xmpp_msg_lastmsg = msg
-  
-def touchURL(url):
-  try:
-    f = urllib.urlopen(url)
-    f.read()
-    f.close()
-  except Exception, e:
-    logging.error("touchURL: "+str(e))
-  
-def displayOpen():
-  distributeXmppMsg(uwscfg.xmpp_msg_opened % action_by)
-  
-def displayClosed():
-  distributeXmppMsg(uwscfg.xmpp_msg_closed % action_by)
-  
+
+def substituteMessageVariables(msg, door_tuple):
+  loop_tokens=3
+  while loop_tokens > 0 and msg.find("${") > -1:
+    #logging.debug("subsMsgVars: loopTok=%d door_tuple=%s msg=%s" % (loop_tokens, str(door_tuple), msg))
+    if not door_tuple is None and type(door_tuple[0]) == types.StringType:
+      msg = msg.replace('${door_action_msg}', uwscfg.msg_door_action_msg)      
+      msg = msg.replace('${door_status}', door_tuple[0]).replace('${by_whom}', "by "+str(door_tuple[1]))
+    else:
+      msg = msg.replace('${door_action_msg}','').replace('${door_status}','').replace('${by_whom}','')
+    loop_tokens-=1
+  return msg
+
+def formatAndDistributePresence(presence, door_tuple=(None,None)):
+  picurl=""
+  if uwscfg.cam_provide_pic == "True":
+    picurl="\n"+uwscfg.cam_picture_url
+  if presence == "yes":
+    distributeXmppMsg(substituteMessageVariables(uwscfg.msg_present, door_tuple)+picurl)
+  else:
+    distributeXmppMsg(substituteMessageVariables(uwscfg.msg_notpresent, door_tuple)+picurl)
+
+def formatAndDistributeWarning(msg, door_tuple=(None,None)):
+  distributeXmppMsg("Warning: "+msg , high_priority=True)
+
+current_status = (None, None, None, None, None) 
+def filterAndFormatMessage(new_status):
+  global current_status
+  if new_status[0] == "error":
+    distributeXmppMsg(uwscfg.msg_status_error_msg, high_priority=True)
+  elif current_status[0] != new_status[0]:
+    distributeXmppMsg("Status: (%s,%s,%s,%s,%s)" % new_status ,debug=True)
+  current_status=new_status
+
 def exitHandler(signum, frame):
+  global sppoo, conn, sockhandle
   logging.info("Door Status Listener stopping")
   try:
+    sppoo.kill()
+  except:
+    pass
+  try:
     conn.close()
   except:
     pass
@@ -208,64 +343,95 @@ signal.signal(signal.SIGINT, exitHandler)
 signal.signal(signal.SIGQUIT, exitHandler)
 
 logging.info("Update-Xmpp-Status started")
-
+ 
 if len(sys.argv) > 1:
-  socketfile = sys.argv[1]
-else:
-  socketfile = "/var/run/tuer/door_cmd.socket"
-  
-if len(sys.argv) > 2:
-  uwscfg = UWSConfig(sys.argv[2])
+  uwscfg = UWSConfig(sys.argv[1])
 else:
   uwscfg = UWSConfig()
 
-sendXmppMsg(uwscfg.xmpp_recipients_debug,"D: update-xmpp-status.py started")
-
-sockhandle = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-RE_STATUS = re.compile(r'Status: (\w+), idle')
-RE_REQUEST = re.compile(r'Request: (\w+) (?:Card )?(.+)')
+distributeXmppMsg("update-xmpp-status.py started", debug=True)
+RE_STATUS = re.compile(r'Status: (closed|opened), (opening|waiting|closing|idle), (ajar|shut).*',re.I)
+RE_REQUEST = re.compile(r'Request: (\w+) (?:(Card|Phone) )?(.+)')
+RE_PRESENCE = re.compile(r'Presence: (yes|no)(?:, (opened|closed), (.+))?')
+RE_BUTTON = re.compile(r'PanicButton|button\d?')
 RE_ERROR = re.compile(r'Error: (.+)')
+RE_WARNING = re.compile(r'Warning: (.+)')
 while True:
   try:
-    sockhandle.connect(socketfile)
+    if not os.path.exists(uwscfg.tracker_socket):
+      logging.debug("Socketfile '%s' not found, waiting 5 secs" % uwscfg.tracker_socket)
+      time.sleep(5)
+      continue
+    sockhandle = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+    sockhandle.connect(uwscfg.tracker_socket)
     conn = os.fdopen(sockhandle.fileno())
-    sockhandle.send("listen\n")
-    sockhandle.send("status\n")
+    #sockhandle.send("listen\n")
+    #sockhandle.send("status\n")
+    last_request = (None, None, None)
+    not_initial_presence = False
     while True:
       line = conn.readline()
       logging.debug("Got Line: " + line)
       
       uwscfg.checkConfigUpdates()
       
+      if line == "":
+        raise Exception("EOF on Socket, daemon seems to have quit")      
+      
+      m = RE_BUTTON.match(line)
+      if not m is None:
+        distributeXmppMsg(uwscfg.msg_bored)
+        continue
+        
+      m = RE_PRESENCE.match(line)
+      if not m is None:
+        if not_initial_presence:
+          formatAndDistributePresence(m.group(1), m.group(2,3))
+        else:
+          not_initial_presence=True
+          distributeXmppMsg("Initial Presence received: %s" % m.group(1) ,debug=True)
+        continue
+      
+      m = RE_WARNING.match(line)
+      if not m is None:
+        errorstr = m.group(1)
+        logging.error("Recieved Warning: "+errorstr)
+        formatAndDistributeWarning(errorstr)
+        continue
+      
       m = RE_STATUS.match(line)
       if not m is None:
         status = m.group(1)
-        if status == "opened":
-          displayOpen()
-        if status == "closed":
-          displayClosed()
+        ajar_status = m.group(3)
+        filterAndFormatMessage((status,ajar_status) + last_request)
+        last_request = (None, None, None)
+        continue
+      
       m = RE_REQUEST.match(line)
-      if not m is None:  
-        #(rq_action,rq_by) = m.group(1,2)
-        action_by = " von " + m.group(2)
-      else:
-        action_by = ""
+      if not m is None:
+        last_request = m.group(1,3,2)
+        if uwscfg.cam_provide_pic == "True" and (last_request[2] is None or not last_request[1] is None):
+          if not touchURL(uwscfg.cam_freeze_url) == "ok":
+            logging.error("main: error freezing picture")
+        continue
+      
       m = RE_ERROR.match(line)
       if not m is None:
         errorstr = m.group(1)
         if "too long!" in errorstr:
-          distributeXmppMsg(uwscfg.xmpp_recipients_debug, "Door Error: "+errorstr, high_priority=True)
+          filterAndFormatMessage(("error","") + last_request)
+          last_request = (None, None, None)
         else:
-          sendXmppMsg(uwscfg.xmpp_recipients_debug, "D: Error: "+errorstr)
+          logging.error("Recieved Error: "+errorstr)
+          distributeXmppMsg("Error: "+errorstr, debug=True)
+          last_request = (None, None, None)
   except Exception, ex:
     logging.error("main: "+str(ex)) 
-    try:
-      conn.close()
-    except:
-      pass
+    traceback.print_exc(file=sys.stdout)
     try:
       sockhandle.close()
     except:
       pass
+    conn=None
+    sockhandle=None
     time.sleep(5)
-