ctdo
/
psychose
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated ekgplotter

This commit is contained in:
Stefan Kögl 2014-04-08 09:34:17 +02:00
parent 40f538223f
commit 823b58488e
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ekgplotter/ekgplotter/main.py
View File

@ -87,16 +87,16 @@ class OSCThread(threading.Thread):
self.args = args self.args = args
self.running = True self.running = True
self.own_address = resolve_host(args.own_host, args.own_port, args.address_family) self.client_address = resolve_host(args.client_host, args.client_port, args.address_family)
self.chaosc_address = chaosc_host, chaosc_port = resolve_host(args.chaosc_host, args.chaosc_port, args.address_family) self.chaosc_address = chaosc_host, chaosc_port = resolve_host(args.chaosc_host, args.chaosc_port, args.address_family)
self.osc_sock = socket.socket(args.address_family, 2, 17) self.osc_sock = socket.socket(args.address_family, 2, 17)
self.osc_sock.bind(self.own_address) self.osc_sock.bind(self.client_address)
self.osc_sock.setblocking(0) self.osc_sock.setblocking(0)
print "%s: starting up osc receiver on '%s:%d'" % ( print "%s: starting up osc receiver on '%s:%d'" % (
datetime.now().strftime("%x %X"), self.own_address[0], self.own_address[1]) datetime.now().strftime("%x %X"), self.client_address[0], self.client_address[1])
self.subscribe_me() self.subscribe_me()
@ -114,8 +114,8 @@ class OSCThread(threading.Thread):
""" """
print "%s: subscribing to '%s:%d' with label %r" % (datetime.now().strftime("%x %X"), self.chaosc_address[0], self.chaosc_address[1], self.args.subscriber_label) print "%s: subscribing to '%s:%d' with label %r" % (datetime.now().strftime("%x %X"), self.chaosc_address[0], self.chaosc_address[1], self.args.subscriber_label)
msg = OSCMessage("/subscribe") msg = OSCMessage("/subscribe")
msg.appendTypedArg(self.own_address[0], "s") msg.appendTypedArg(self.client_address[0], "s")
msg.appendTypedArg(self.own_address[1], "i") msg.appendTypedArg(self.client_address[1], "i")
msg.appendTypedArg(self.args.authenticate, "s") msg.appendTypedArg(self.args.authenticate, "s")
if self.args.subscriber_label is not None: if self.args.subscriber_label is not None:
msg.appendTypedArg(self.args.subscriber_label, "s") msg.appendTypedArg(self.args.subscriber_label, "s")
@ -128,8 +128,8 @@ class OSCThread(threading.Thread):
print "%s: unsubscribing from '%s:%d'" % (datetime.now().strftime("%x %X"), self.chaosc_address[0], self.chaosc_address[1]) print "%s: unsubscribing from '%s:%d'" % (datetime.now().strftime("%x %X"), self.chaosc_address[0], self.chaosc_address[1])
msg = OSCMessage("/unsubscribe") msg = OSCMessage("/unsubscribe")
msg.appendTypedArg(self.own_address[0], "s") msg.appendTypedArg(self.client_address[0], "s")
msg.appendTypedArg(self.own_address[1], "i") msg.appendTypedArg(self.client_address[1], "i")
msg.appendTypedArg(self.args.authenticate, "s") msg.appendTypedArg(self.args.authenticate, "s")
self.osc_sock.sendto(msg.encode_osc(), self.chaosc_address) self.osc_sock.sendto(msg.encode_osc(), self.chaosc_address)
@ -410,9 +410,15 @@ class MyHandler(BaseHTTPRequestHandler):
return return
except (KeyboardInterrupt, SystemError): except (KeyboardInterrupt, SystemError):
print "queue size", queue.qsize() print "queue size", queue.qsize()
thread.running = False if hasattr(self, "thread"):
thread.join() self.thread.running = False
self.thread.join()
del self.thread
except IOError, e: except IOError, e:
if hasattr(self, "thread"):
self.thread.running = False
self.thread.join()
del self.thread
print "ioerror", e print "ioerror", e
print '-'*40 print '-'*40
print 'Exception happened during processing of request from' print 'Exception happened during processing of request from'
@ -427,13 +433,14 @@ class JustAHTTPServer(HTTPServer):
def main(): def main():
arg_parser = ArgParser("ekgplotter") arg_parser = ArgParser("ekgplotter")
own_group = arg_parser.add_main_group() arg_parser.add_global_group()
arg_parser.add_argument(own_group, '-x', "--http_host", default="::", client_group = arg_parser.add_client_group()
arg_parser.add_argument(client_group, '-x', "--http_host", default="::",
help='my host, defaults to "::"') help='my host, defaults to "::"')
arg_parser.add_argument(own_group, '-X', "--http_port", default=9000, arg_parser.add_argument(client_group, '-X', "--http_port", default=9000,
type=int, help='my port, defaults to 9000') type=int, help='my port, defaults to 9000')
arg_parser.add_chaosc_group() arg_parser.add_chaosc_group()
add_subscriber_group() arg_parser.add_subscriber_group()
args = arg_parser.finalize() args = arg_parser.finalize()
http_host, http_port = resolve_host(args.http_host, args.http_port, args.address_family) http_host, http_port = resolve_host(args.http_host, args.http_port, args.address_family)