X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=update-web-status.py;h=78e3d71e33a5de4b072a9ed68e230cc9c5da8a23;hb=26a46e58c6449468c98df0b7a5f94870bb9c4aea;hp=c4fffa62ae6ee8a28109da11d13579c1111eb0d0;hpb=3ee5facd769b111061569c3047a63d33efaa2aef;p=svn42.git
diff --git a/update-web-status.py b/update-web-status.py
index c4fffa6..78e3d71 100755
--- a/update-web-status.py
+++ b/update-web-status.py
@@ -29,10 +29,15 @@ class UWSConfig:
self.config_parser=ConfigParser.ConfigParser()
self.config_parser.add_section('web')
self.config_parser.set('web','cgiuri','https://www.realraum.at/cgi/status.cgi?pass=jako16&set=')
- self.config_parser.set('web','htmlopen','Tür ist Offen')
- self.config_parser.set('web','htmlclosed','Tür ist Geschlossen')
+ #~ self.config_parser.set('web','htmlopen','Tür ist Offen')
+ #~ self.config_parser.set('web','htmlclosed','Tür ist Geschlossen')
+ self.config_parser.set('web','htmlbored','Panic! Present&Bored')
+ self.config_parser.set('web','htmlopen','Leute Anwesend')
+ self.config_parser.set('web','htmlclosed','Keiner Da')
self.config_parser.add_section('debug')
self.config_parser.set('debug','enabled',"False")
+ self.config_parser.add_section('tracker')
+ self.config_parser.set('tracker','socket',"/var/run/tuer/presence.socket")
self.config_mtime=0
if not self.configfile is None:
try:
@@ -161,7 +166,10 @@ def displayOpen():
def displayClosed():
setRealraumHtmlStatus(uwscfg.web_htmlclosed)
-
+
+def displayPanic():
+ setRealraumHtmlStatus(uwscfg.web_htmlbored)
+
def exitHandler(signum, frame):
logging.info("Update-Web-Status stopping")
try:
@@ -182,30 +190,26 @@ signal.signal(signal.SIGQUIT, exitHandler)
logging.info("Door Status Listener 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()
#socket.setdefaulttimeout(10.0) #affects all new Socket Connections (urllib as well)
-RE_STATUS = re.compile(r'Status: (\w+), idle')
-RE_REQUEST = re.compile(r'Request: (\w+) (?:Card )?(.+)')
-RE_ERROR = re.compile(r'Error: (.+)')
+RE_PRESENCE = re.compile(r'Presence: (yes|no)(?:, (opened|closed), (.+))?')
+RE_BUTTON = re.compile(r'PanicButton|button\d?')
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_status=None
+ unixts_panic_button=None
while True:
line = conn.readline()
logging.debug("Got Line: " + line)
@@ -215,28 +219,37 @@ while True:
if line == "":
raise Exception("EOF on Socket, daemon seems to have quit")
- m = RE_STATUS.match(line)
+ m = RE_PRESENCE.match(line)
if not m is None:
status = m.group(1)
- if status == "opened":
+ last_status=(status == "yes")
+ unixts_panic_button=None
+ if last_status:
displayOpen()
- if status == "closed":
+ else:
displayClosed()
- #~ 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 = ""
- #~ m = RE_ERROR.match(line)
- #~ if not m is None:
- #~ errorstr = m.group(1)
- #~ #handle Error
+ continue
+
+ m = RE_BUTTON.match(line)
+ if not m is None:
+ displayPanic()
+ unixts_panic_button=time.time()
+ continue
+
+ if not last_status is None and not unixts_panic_button is None and time.time() - unixts_panic_button > 3600:
+ unixts_panic_button=None
+ if last_status:
+ displayOpen()
+ else:
+ displayClosed()
+ continue
+
except Exception, ex:
logging.error("main: "+str(ex))
try:
sockhandle.close()
except:
pass
+ conn=None
+ sockhandle=None
time.sleep(5)
-