Merge pull request #12 from wildfoundry/auto-close

Auto close

m2mclient/_version.py

@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-VERSION = "0.1.7"
+VERSION = "0.1.8"

m2mclient/client.py

@@ -37,18 +37,21 @@ def client(self):
     def run(self):
         """Main thread loop."""
         try:
-            for event in self.ws:
-                if event.name == 'rejected':
-                    self.error = event.reason
-                elif event.name == 'disconnected':
-                    if not event.graceful:
+            with self.ws:
+                for event in self.ws:
+                    if event.name == 'rejected':
                         self.error = event.reason
-                elif event.name == 'ready':
-                    self.running = True
-                    self.on_startup()
-                    self.ready_event.set()
-                elif event.name == 'binary':
-                    self.on_binary(event.data)
+                    elif event.name == 'disconnected':
+                        if not event.graceful:
+                            self.error = event.reason
+                    elif event.name == 'ready':
+                        self.running = True
+                        self.on_startup()
+                        self.ready_event.set()
+                    elif event.name == 'binary':
+                        self.on_binary(event.data)
+        except Exception:
+            log.exception('error in m2m thread')
         finally:
             self.running = False
             self.ready_event.set()

setup.py

@@ -27,7 +27,7 @@
     exclude_package_data={'': ['_*', 'docs/*']},
     classifiers=classifiers,
     install_requires=[
-        'lomond==0.1.6',
+        'lomond==0.1.7a0',
         'wsaccel==0.6.2'
     ]
 )