From a2ba3511cd61770c608b4e39a4c88e4910334846 Mon Sep 17 00:00:00 2001
From: kngwyu <yuji.kngw.80s.revive@gmail.com>
Date: Wed, 14 Apr 2021 12:06:56 +0900
Subject: [PATCH] Fix server shutdown

---
 MANIFEST.in                    |   3 ++-
 mujoco_maze/maze_env.py        |   8 ++++----
 mujoco_maze/static/favicon.ico | Bin 0 -> 2040 bytes
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 mujoco_maze/static/favicon.ico

diff --git a/MANIFEST.in b/MANIFEST.in
index fd381a6..67ae514 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1,2 @@
-include mujoco-maze/static/index.html
\ No newline at end of file
+include mujoco-maze/static/favicon.ico
+include mujoco-maze/templates/index.html
\ No newline at end of file
diff --git a/mujoco_maze/maze_env.py b/mujoco_maze/maze_env.py
index 2542f67..7e7a68f 100644
--- a/mujoco_maze/maze_env.py
+++ b/mujoco_maze/maze_env.py
@@ -370,7 +370,6 @@ class MazeEnv(gym.Env):
                 super().__init__()
                 self.pipe = pipe
                 self.port = port
-                self.server = None
 
             def _run_server(self) -> None:
                 import asyncio
@@ -384,6 +383,7 @@ class MazeEnv(gym.Env):
                 app = fastapi.FastAPI()
                 html_path = pathlib.Path(__file__).parent.joinpath("static/index.html")
                 html = html_path.read_text().replace("{{port}}", str(self.port))
+                server = None
 
                 @app.get("/")
                 async def get():
@@ -403,11 +403,11 @@ class MazeEnv(gym.Env):
                             res = stream.getvalue()
                             await websocket.send_bytes(res)
                     await websocket.close()
-                    await self.server.shutdown()
+                    server.should_exit = True
 
                 config = uvicorn.Config(app, port=self.port)
-                self.server = uvicorn.Server(config)
-                self.server.run()
+                server = uvicorn.Server(config)
+                server.run()
 
             def run(self) -> None:
                 try:
diff --git a/mujoco_maze/static/favicon.ico b/mujoco_maze/static/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..45acf83b6535edeae3c9da3588404583625b926b
GIT binary patch
literal 2040
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
WQViuANLz~l0000<MNUMnLSTY7wAEq&

literal 0
HcmV?d00001