Changeset 178

Timestamp:

07/25/12 21:40:03 (12 years ago)

Author:

atzm

Message:

• fix error handling

File:

• etherws/trunk/etherws.py (modified) (9 diffs)

etherws/trunk/etherws.py

@@ -201 +201 @@
     READ_SIZE = 65535
 
-    def __init__(self, switch, dev, debug=False):
+    def __init__(self, ioloop, switch, dev, debug=False):
+        self._ioloop = ioloop
         self._switch = switch
         self._dev = dev
@@ -217 +218 @@
         self._tap.up()
         self._switch.register_port(self)
+        self._ioloop.add_handler(self.fileno(), self, self._ioloop.READ)
 
     def close(self):
         if self.closed:
             raise ValueError('I/O operation on closed tap')
+        self._ioloop.remove_handler(self.fileno())
         self._switch.unregister_port(self)
         self._tap.close()
@@ -241 +244 @@
         except:
             traceback.print_exc()
-        tornado.ioloop.IOLoop.instance().stop()  # XXX: should unregister fd
+        self.close()
 
     def _read(self):
@@ -273 +276 @@
 
 class EtherWebSocketClient(DebugMixIn):
-    def __init__(self, switch, url, cred=None, debug=False):
+    def __init__(self, ioloop, switch, url, cred=None, debug=False):
+        self._ioloop = ioloop
         self._switch = switch
         self._url = url
@@ -295 +299 @@
         self._sock.connect(self._url, **self._options)
         self._switch.register_port(self)
+        self._ioloop.add_handler(self.fileno(), self, self._ioloop.READ)
         self.dprintf('connected: %s\n', lambda: self._url)
 
@@ -300 +305 @@
         if self.closed:
             raise websocket.WebSocketException('already closed')
+        self._ioloop.remove_handler(self.fileno())
         self._switch.unregister_port(self)
         self._sock.close()
@@ -327 +333 @@
         except:
             traceback.print_exc()
-        tornado.ioloop.IOLoop.instance().stop()  # XXX: should unregister fd
+        self.close()
 
 
@@ -470 +476 @@
 
     for dev in args.device:
-        tap = TapHandler(switch, dev, debug=args.debug)
+        tap = TapHandler(ioloop, switch, dev, debug=args.debug)
         tap.open()
-        ioloop.add_handler(tap.fileno(), tap, ioloop.READ)
 
     if not args.foreground:
@@ -506 +511 @@
 
     for uri in args.uri:
-        client = EtherWebSocketClient(switch, uri, cred, args.debug)
+        client = EtherWebSocketClient(ioloop, switch, uri, cred, args.debug)
         client.open()
-        ioloop.add_handler(client.fileno(), client, ioloop.READ)
 
     for dev in args.device:
-        tap = TapHandler(switch, dev, debug=args.debug)
+        tap = TapHandler(ioloop, switch, dev, debug=args.debug)
         tap.open()
-        ioloop.add_handler(tap.fileno(), tap, ioloop.READ)
 
     if not args.foreground: