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('debug')
self.config_parser.set('debug','enabled',"False")
self.config_mtime=0
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:
else:
sendXmppMsg(uwscfg.xmpp_recipients_debug, "D: " + msg)
-current_status = (None,None,None)
+current_status = (None, None, None)
def filterAndFormatMessage(new_status):
global current_status
- if current_status == new_status or new_status == (current_status[0],None,None):
+ if new_status in [current_status, (current_status[0], None, None)] :
distributeXmppMsg("Status recieved but filtered: (%s,%s,%s)" % new_status ,debug=True)
+ elif current_status == (None, None, None):
+ current_status=new_status
+ distributeXmppMsg("Initial Status: (%s,%s,%s)" % new_status ,debug=True)
else:
(status,req,req_comment) = new_status
high_priority_msg = False
- if status == "opened":
- status_msg = uwscfg.msg_status_opened_msg
- elif status == "closed":
- status_msg = uwscfg.msg_status_closed_msg
- elif status == "error":
+ req_msg=""
+ status_msg=""
+ comment_msg=""
+ 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:
comment_msg = uwscfg.msg_comment_msg.replace("${comment}",req_comment)
msg = uwscfg.msg_format.replace("${status_msg}", status_msg).replace("${request_msg}",req_msg).replace("${comment_msg}",comment_msg)
distributeXmppMsg(msg, high_priority=high_priority_msg)
- current_status=new_status
+ current_status=new_status
def exitHandler(signum, frame):
logging.info("Door Status Listener stopping")
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)
+ time.sleep(5)
+ continue
sockhandle = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
sockhandle.connect(socketfile)
conn = os.fdopen(sockhandle.fileno())
sockhandle.send("listen\n")
sockhandle.send("status\n")
- last_request = (None,None)
+ last_request = (None, None)
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_STATUS.match(line)
if not m is None:
status = m.group(1)
if not m is None:
last_request = m.group(1,2)
else:
- last_request = (None,None)
+ last_request = (None, None)
m = RE_ERROR.match(line)
if not m is None:
errorstr = m.group(1)
sockhandle.close()
except:
pass
+ conn=None
+ sockhandle=None
time.sleep(5)
-