revert to original changes

alpaca_trade_api/stream.py

@@ -76,11 +76,11 @@ async def _start_ws(self):
         log.info(f'connected to: {self._endpoint}')
 
     async def close(self):
-        self._run_forever_flag = False
         if self._ws:
             await self._ws.close()
             self._ws = None
             self._running = False
+        self._run_forever_flag = False
 
     async def stop_ws(self):
         self._stop_stream_queue.put_nowait({"should_stop": True})
@@ -467,11 +467,11 @@ async def _run_forever(self):
                 await asyncio.sleep(0.01)
 
     async def close(self):
-        self._run_forever_flag = False
         if self._ws:
             await self._ws.close()
             self._ws = None
             self._running = False
+        self._run_forever_flag = False
 
     async def stop_ws(self):
         self._stop_stream_queue.put_nowait({"should_stop": True})
@@ -655,9 +655,12 @@ def run(self):
             pass
 
     async def _close(self):
-        await self._trading_ws.close()
-        await self._data_ws.close()
-        await self._crypto_ws.close()
+        await asyncio.gather(
+            self.stop_ws(),
+            self._trading_ws.close(),
+            self._data_ws.close(),
+            self._crypto_ws.close()
+            )
 
     def close(self):
         loop = asyncio.get_event_loop()