Do not load uvloop by default (#809)
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Tue, 1 Aug 2023 21:28:25 +0000 (23:28 +0200)
committerGitHub <noreply@github.com>
Tue, 1 Aug 2023 21:28:25 +0000 (23:28 +0200)
instead make it a startup option

music_assistant/__main__.py
music_assistant/server/server.py

index 5e1f3c4c015893675cea4d01a70ee4e7754cbd6b..63d7d9b875e00d2e39892ed520ac813b745de8b3 100644 (file)
@@ -48,6 +48,7 @@ def get_arguments():
         help="Provide logging level. Example --log-level debug, "
         "default=info, possible=(critical, error, warning, info, debug)",
     )
+    parser.add_argument("-u", "--enable-uvloop", action="store_true")
     arguments = parser.parse_args()
     return arguments
 
@@ -151,6 +152,7 @@ def main():
         hass_options = {}
 
     log_level = hass_options.get("log_level", args.log_level).upper()
+    enable_uvloop = bool(hass_options.get("enable_uvloop", args.enable_uvloop))
     dev_mode = os.environ.get("PYTHONDEVMODE", "0") == "1"
 
     # setup logger
@@ -173,7 +175,7 @@ def main():
 
     run(
         start_mass(),
-        use_uvloop=True,
+        use_uvloop=enable_uvloop,
         shutdown_callback=on_shutdown,
         executor_workers=64,
     )
index 99e79b09c8a26ba8ad0fb14dc655032ca25a3871..2bd1aa3305daea750098b56cfbef1b4fc486008d 100644 (file)
@@ -116,7 +116,12 @@ class MusicAssistant:
         # setup config controller first and fetch important config values
         self.config = ConfigController(self)
         await self.config.setup()
-        LOGGER.info("Starting Music Assistant Server (%s) version %s", self.server_id, self.version)
+        LOGGER.info(
+            "Starting Music Assistant Server (%s) version %s - uvloop: %s",
+            self.server_id,
+            self.version,
+            "uvloop" in str(self.loop),
+        )
         # setup other core controllers
         self.cache = CacheController(self)
         self.webserver = WebserverController(self)