Merge pull request #201 from steowens/master

This change is to address the issue with run_forever() terminating too early.
Lawouach · Dec 12, 2016 · 657ca45 · 657ca45
2 parents fd55907 + 608d648
commit 657ca45
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/ws4py/websocket.py b/ws4py/websocket.py
@@ -404,16 +404,15 @@ def terminate(self):
         good and cleanup resources by unsetting
         the `environ` and `stream` attributes.
         """
-        s = self.stream
-
-        self.client_terminated = self.server_terminated = True
+        s = self.stream       
 
         try:
             if s.closing is None:
                 self.closed(1006, "Going away")
             else:
                 self.closed(s.closing.code, s.closing.reason)
         finally:
+            self.client_terminated = self.server_terminated = True
             self.close_connection()
 
             # Cleaning up resources