X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=update-xmpp-status.py;h=14c80078d1fad3a0467baee5db3090ee76d8240c;hb=44da1f523dcdaf2fef158076f138ac8be5cb89fe;hp=42d5dccde87c4e2b9bb13b1dc375fa800b488a7b;hpb=d3bebd565cf3f3e0f63f25ca6dd124dce7eea72a;p=svn42.git diff --git a/update-xmpp-status.py b/update-xmpp-status.py index 42d5dcc..14c8007 100755 --- a/update-xmpp-status.py +++ b/update-xmpp-status.py @@ -37,8 +37,12 @@ class UWSConfig: self.config_parser.set('msg','status_opened_msg',"RealRaum door now open") self.config_parser.set('msg','status_closed_msg',"RealRaum door now closed") self.config_parser.set('msg','status_error_msg',"ERROR Last Operation took too long !!!") - self.config_parser.set('msg','request_msg'," after ${request} request") - self.config_parser.set('msg','comment_msg'," (${comment})") + self.config_parser.set('msg','request_msg',"\safter ${request} request") + self.config_parser.set('msg','comment_msg',"\s(${comment})") + self.config_parser.set('msg','status_still_opened_msg',"Door remains closed") + self.config_parser.set('msg','status_still_closed_msg',"Door remains open") + 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 @@ -67,6 +71,13 @@ class UWSConfig: self.config_mtime=os.path.getmtime(self.configfile) except (ConfigParser.ParsingError, IOError), pe_ex: logging.error("Error parsing Configfile: "+str(pe_ex)) + self.config_parser.set('msg','comment_msg', self.config_parser.get('msg','comment_msg').replace("\\s"," ")) + self.config_parser.set('msg','request_msg', self.config_parser.get('msg','request_msg').replace("\\s"," ")) + self.config_parser.set('msg','status_error_msg', self.config_parser.get('msg','status_error_msg').replace("\\s"," ")) + self.config_parser.set('msg','status_closed_msg', self.config_parser.get('msg','status_closed_msg').replace("\\s"," ")) + self.config_parser.set('msg','status_opened_msg', self.config_parser.get('msg','status_opened_msg').replace("\\s"," ")) + self.config_parser.set('msg','status_still_closed_msg', self.config_parser.get('msg','status_still_closed_msg').replace("\\s"," ")) + self.config_parser.set('msg','status_still_opened_msg', self.config_parser.get('msg','status_still_opened_msg').replace("\\s"," ")) if self.config_parser.get('debug','enabled') == "True": logger.setLevel(logging.DEBUG) else: @@ -178,7 +189,13 @@ def distributeXmppMsg(msg,high_priority=False,debug=False): sendXmppMsg(uwscfg.xmpp_recipients_nooffline, msg, noofflinemsg=(not high_priority)) else: sendXmppMsg(uwscfg.xmpp_recipients_debug, "D: " + msg) - + +def formatAndDistributePresence(presence): + if presence == "yes": + distributeXmppMsg("Somebody is present right now") + else: + distributeXmppMsg("Nobody is here, everybody left") + current_status = (None, None, None) def filterAndFormatMessage(new_status): global current_status @@ -193,16 +210,28 @@ def filterAndFormatMessage(new_status): req_msg="" status_msg="" comment_msg="" - if status == "opened": - status_msg = uwscfg.msg_status_opened_msg - elif status == "closed": - status_msg = uwscfg.msg_status_closed_msg - elif status == "error": + if status == "error": status_msg = uwscfg.msg_status_error_msg high_priority_msg=True else: - distributeXmppMsg("Unknown Status: (%s,%s,%s)" % new_status ,debug=True) - return + if current_status[0] == status: + if status == "opened": + status_msg = uwscfg.msg_status_still_opened_msg + elif status == "closed": + status_msg = uwscfg.msg_status_still_closed_msg + else: + logging.error("Unknown Status recieved: (%s,%s,%s)" % new_status) + distributeXmppMsg("Unknown Status: (%s,%s,%s)" % new_status ,debug=True) + return + else: + if status == "opened": + status_msg = uwscfg.msg_status_opened_msg + elif status == "closed": + status_msg = uwscfg.msg_status_closed_msg + else: + logging.error("Unknown Status recieved: (%s,%s,%s)" % new_status) + distributeXmppMsg("Unknown Status: (%s,%s,%s)" % new_status ,debug=True) + return if req: req_msg = uwscfg.msg_request_msg.replace("${request}",req) if req_comment: @@ -229,32 +258,28 @@ 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() distributeXmppMsg("update-xmpp-status.py started", debug=True) RE_STATUS = re.compile(r'Status: (\w+), idle') RE_REQUEST = re.compile(r'Request: (\w+) (?:Card )?(.+)') +RE_PRESENCE = re.compile(r'Presence: (yes|no)') RE_ERROR = re.compile(r'Error: (.+)') while True: try: - if not os.path.exists(socketfile): - logging.debug("Socketfile '%s' not found, waiting 5 secs" % 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(socketfile) + 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) while True: line = conn.readline() @@ -262,23 +287,33 @@ while True: uwscfg.checkConfigUpdates() + if line == "": + raise Exception("EOF on Socket, daemon seems to have quit") + + m = RE_PRESENCE.match(line) + if not m is None: + formatAndDistributePresence(m.group(1)) + continue m = RE_STATUS.match(line) if not m is None: status = m.group(1) filterAndFormatMessage((status,) + last_request) + last_request = (None, None) + continue m = RE_REQUEST.match(line) if not m is None: last_request = m.group(1,2) - else: - last_request = (None, None) + continue m = RE_ERROR.match(line) if not m is None: errorstr = m.group(1) if "too long!" in errorstr: filterAndFormatMessage(("error",) + last_request) + last_request = (None, None) else: logging.error("Recieved Error: "+errorstr) distributeXmppMsg("Error: "+errorstr, debug=True) + last_request = (None, None) except Exception, ex: logging.error("main: "+str(ex)) try: @@ -288,4 +323,3 @@ while True: conn=None sockhandle=None time.sleep(5) -