From: realraum Date: Thu, 30 Apr 2009 02:26:04 +0000 (+0000) Subject: gleichzeitig lesen und schreibne ist scheinbar problematisch ? X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=f35f9cb4a955f6f41857177a98e6f24c5342ef7d;p=svn42.git gleichzeitig lesen und schreibne ist scheinbar problematisch ? --- diff --git a/door_daemon.py b/door_daemon.py index 903d6cf..6634936 100755 --- a/door_daemon.py +++ b/door_daemon.py @@ -8,27 +8,32 @@ import urllib import time import signal import re +import socket -logging.basicConfig(level=logging.INFO,filename='/var/log/tuer.log') +logging.basicConfig(level=logging.INFO,filename='/var/log/tuer.log',format="%(asctime)s %(message)s",datefmt="%Y-%m-%d %H:%M") -class StatusDisplay(object): - def __init__(self): +class StatusDisplay(): + def __init__(self): self.url_open = 'https://www.realraum.at/cgi/status.cgi?pass=jako16&set=%3Chtml%3E%3Cbody%20bgcolor=%22lime%22%3E%3Ch3%3E%3Ccenter%3ETuer%20ist%20Offen%3C/center%3E%3C/h3%3E%3C/body%3E%3C/html%3E'; self.url_closed = 'https://www.realraum.at/cgi/status.cgi?pass=jako16&set=%3Chtml%3E%3Cbody%20bgcolor=%22red%22%3E%3Ch3%3E%3Ccenter%3ETuer%20ist%20Geschlossen%3C/center%3E%3C/h3%3E%3C/body%3E%3C/html%3E'; self.last_status_set=self.url_open #object.__init__(self) - def display_open(self): - if self.last_status_set != self.url_open: - self.last_status_set=self.url_open - f = urllib.urlopen(self.last_status_set) - f.close() - - def display_closed(self): - if self.last_status_set != self.url_closed: - self.last_status_set=self.url_closed - f = urllib.urlopen(self.last_status_set) - f.close() + def display_open(self): + if self.last_status_set != self.url_open: + self.last_status_set=self.url_open + print "accessing %s\n" % self.last_status_set + f = urllib.urlopen(self.last_status_set) + f.read() + f.close() + + def display_closed(self): + if self.last_status_set != self.url_closed: + self.last_status_set=self.url_closed + print "accessing %s\n" % self.last_status_set + f = urllib.urlopen(self.last_status_set) + f.read() + f.close() class ArduinoUSBThread ( threading.Thread ): @@ -44,56 +49,59 @@ class ArduinoUSBThread ( threading.Thread ): self.last_status=None self.cv_updatestatus = threading.Condition(); #lock ist automatically created withing condition self.file_dev_ttyusb=file_dev_ttyusb + self.fh = open(self.file_dev_ttyusb,"w+") self.statusdisplay = StatusDisplay() threading.Thread.__init__(self) def stop(self): self.running=False self.fh.close() + if (self.readfh): + self.readfh.close() def send_open(self): self.send_statusrequest() - self.cv_updatestatus.acquire() - self.cv_updatestatus.wait(3.0) - self.cv_updatestatus.release() - if re_isidle.search(self.lastline): + if self.re_isidle.search(self.lastline): logging.info("Opening Door") + print("\nSending o..") self.fh.write("o"); + print("done\n") def send_close(self): self.send_statusrequest() - self.cv_updatestatus.acquire() - self.cv_updatestatus.wait(3.0) - self.cv_updatestatus.release() - if re_isidle.search(self.lastline): + if self.re_isidle.search(self.lastline): logging.info("Closing Door") + print("\nSending c..") self.fh.write("c"); + print("done\n") def send_toggle(self): self.send_statusrequest() - self.cv_updatestatus.acquire() - self.cv_updatestatus.wait(3.0) - self.cv_updatestatus.release() - if re_isidle.search(self.lastline): - if self.last_status == "open": - logging.info("Closing Door") - self.fh.write("c"); - elif self.last_status == "closed": - logging.info("Opening Door") - self.fh.write("o"); + if self.last_status == "open": + self.send_close() + elif self.last_status == "closed": + self.send_open() def send_reset(self): logging.info("Resetting Door") + print("\nSending r..") self.fh.write("r"); + print("done\n") def send_statusrequest(self): + print("\nSending s..") self.fh.write("s"); + print("done\n") + self.cv_updatestatus.acquire() + self.cv_updatestatus.wait(3.0) + self.cv_updatestatus.release() def run (self): - self.fh = open(self.file_dev_ttyusb,"rw") - while (self.running): + self.readfh = open(self.file_dev_ttyusb,"r") + while (self.running and self.readfh): print "." - line = self.fh.readline(); + line = self.readfh.readline(); + print "l" self.cv_updatestatus.acquire() self.lastline=line logging.info(self.file_dev_ttyusb+": "+self.lastline) @@ -110,8 +118,8 @@ class ArduinoUSBThread ( threading.Thread ): self.send_reset() self.cv_updatestatus.notifyAll() self.cv_updatestatus.release() - if self.fh: - self.fh.close() + if self.readfh: + self.readfh.close() class ControlFIFOThread ( threading.Thread ): def __init__(self, file_fifo, arduino): @@ -126,42 +134,60 @@ class ControlFIFOThread ( threading.Thread ): self.fh.close() def run (self): - self.fh = open(self.file_fifo,"r") + self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + try: + os.remove(self.file_fifo) + except OSError: + pass + self.socket.bind(self.file_fifo) + self.socket.listen(1) while (self.running): print "." - line=self.fh.readline() - m = self.re_cmd.match(line) - if not m is None: - (cmd,who) = m.group(1,2) - if cmd == "open": - logging.info("Open Requested by %s" % who) - arduino.send_open() - elif cmd == "close": - logging.info("Close Requested by %s" % who) - arduino.send_close() - elif cmd == "toggle": - logging.info("Toggle Requested by %s" % who) - arduino.send_toggle() - elif cmd == "reset": - logging.info("Reset Requested by %s" % who) - arduino.send_reset() - elif cmd == "status": - arduino.send_statusrequest() - elif cmd == "log": - logging.info(who) - else: - logging.info("Invalid Command %s %s" % (cmd,who)) - if self.fh: - self.fh.close() - + self.socketconn, addr = self.socket.accept() + self.conn = os.fdopen(self.socketconn.fileno()) + print "a" + while self.socketconn: + #~ line="" + #~ while 1: + #~ print "d" + #~ data = self.conn.recv(1024) + #~ if not data: + #~ break + #~ else: + #~ line+= data + line=self.conn.readline() + print "f" + m = self.re_cmd.match(line) + if not m is None: + (cmd,who) = m.group(1,2) + if cmd == "open": + logging.info("Open Requested by %s" % who) + arduino.send_open() + elif cmd == "close": + logging.info("Close Requested by %s" % who) + arduino.send_close() + elif cmd == "toggle": + logging.info("Toggle Requested by %s" % who) + arduino.send_toggle() + elif cmd == "reset": + logging.info("Reset Requested by %s" % who) + arduino.send_reset() + elif cmd == "status": + arduino.send_statusrequest() + + elif cmd == "log": + logging.info(who) + else: + logging.info("Invalid Command %s %s" % (cmd,who)) + print "c" + self.conn.close() + self.socketconn.close() + if self.socket: + self.socket.shutdown(socket.SHUT_RDWR) -fifofile = "/tmp/door_cmd.fifo" -if (not os.path.exists(fifofile)): - os.system("mkfifo -m 600 $fifofile") - os.system("setfacl -m u:realraum:rw $fifofile") - os.system("setfacl -m u:asterisk:rw $fifofile") +fifofile = "/tmp/door_cmd.socket" logging.info("Door Daemon started")