From 9fb33ee37c15aefb752333f7ca9f9b6d9f330b6d Mon Sep 17 00:00:00 2001
From: c-bata <contact@c-bata.link>
Date: Thu, 12 May 2022 13:26:04 +0900
Subject: [PATCH] Refactor cli.py

---
 optuna_dashboard/_cli.py | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/optuna_dashboard/_cli.py b/optuna_dashboard/_cli.py
index 5920bdbd..8c1cb799 100644
--- a/optuna_dashboard/_cli.py
+++ b/optuna_dashboard/_cli.py
@@ -26,20 +26,10 @@ class ThreadedWSGIServer(ThreadingMixIn, WSGIServer):
 
 
 def run_wsgiref(app: Bottle, host: str, port: int, quiet: bool) -> None:
-    if DEBUG:
-        run(
-            app,
-            host=host,
-            port=port,
-            server="wsgiref",
-            quiet=quiet,
-            reloader=DEBUG,
-        )
-    else:
-        print(f"Listening on http://{host}:{port}/", file=sys.stderr)
-        print("Hit Ctrl-C to quit.\n", file=sys.stderr)
-        httpd = make_server(host, port, app, server_class=ThreadedWSGIServer)
-        httpd.serve_forever()
+    print(f"Listening on http://{host}:{port}/", file=sys.stderr)
+    print("Hit Ctrl-C to quit.\n", file=sys.stderr)
+    httpd = make_server(host, port, app, server_class=ThreadedWSGIServer)
+    httpd.serve_forever()
 
 
 def run_gunicorn(app: Bottle, host: str, port: int, quiet: bool) -> None:
@@ -60,6 +50,17 @@ def run_gunicorn(app: Bottle, host: str, port: int, quiet: bool) -> None:
     Application().run()
 
 
+def run_debug_server(app: Bottle, host: str, port: int, quiet: bool) -> None:
+    run(
+        app,
+        host=host,
+        port=port,
+        server="wsgiref",
+        quiet=quiet,
+        reloader=DEBUG,
+    )
+
+
 def auto_select_server(
     server_arg: Literal["auto", "gunicorn", "wsgiref"]
 ) -> Literal["gunicorn", "wsgiref"]:
@@ -105,7 +106,9 @@ def main() -> None:
         app = register_profiler_view(app, storage)
 
     server = auto_select_server(args.server)
-    if server == "wsgiref":
+    if DEBUG:
+        run_debug_server(app, args.host, args.port, args.quiet)
+    elif server == "wsgiref":
         run_wsgiref(app, args.host, args.port, args.quiet)
     elif server == "gunicorn":
         run_gunicorn(app, args.host, args.port, args.quiet)