- 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())
+ while 1:
+ #~ line=""
+ #~ while 1:
+ #~ print "d"
+ #~ data = self.conn.recv(1024)
+ #~ if not data:
+ #~ break
+ #~ else:
+ #~ line+= data
+ line=self.conn.readline()
+ if not line:
+ break
+ 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))
+ self.conn.close()
+ self.socketconn.close()
+ if self.socket:
+ self.socket.shutdown(socket.SHUT_RDWR)