X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=update-web-status.py;h=10114617c44903a12dcdc13d9179cb05e0d28165;hb=44da1f523dcdaf2fef158076f138ac8be5cb89fe;hp=1de42ad36ecf1c6e116db78c8afcfb78a0b078e0;hpb=39f534c6513a4a9e26b1cbd80b08a727226eac78;p=svn42.git
diff --git a/update-web-status.py b/update-web-status.py
index 1de42ad..1011461 100755
--- a/update-web-status.py
+++ b/update-web-status.py
@@ -29,8 +29,10 @@ 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','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')
@@ -184,30 +186,24 @@ 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_STATUS = re.compile(r'Status: (\w+), idle')
+RE_PRESENCE = re.compile(r'Presence: (yes|no)')
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")
while True:
line = conn.readline()
logging.debug("Got Line: " + line)
@@ -217,23 +213,13 @@ 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":
+ if status == "yes":
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
except Exception, ex:
logging.error("main: "+str(ex))
try: