Merge pull request #1035 from yunstanford/patch-N

Adopt new websockets interface

sanic/server.py

@@ -636,7 +636,9 @@ def serve(host, port, request_handler, error_handler, before_start=None,
         coros = []
         for conn in connections:
             if hasattr(conn, "websocket") and conn.websocket:
-                coros.append(conn.websocket.close_connection(force=True))
+                coros.append(
+                    conn.websocket.close_connection(after_handshake=True)
+                )
             else:
                 conn.close()
 

sanic/worker.py

@@ -115,7 +115,9 @@ class GunicornWorker(base.Worker):
             coros = []
             for conn in self.connections:
                 if hasattr(conn, "websocket") and conn.websocket:
-                    coros.append(conn.websocket.close_connection(force=True))
+                    coros.append(
+                        conn.websocket.close_connection(after_handshake=False)
+                    )
                 else:
                     conn.close()
             _shutdown = asyncio.gather(*coros, loop=self.loop)