diff --git a/redbot/cogs/audio/manager.py b/redbot/cogs/audio/manager.py index d9fd08ecd..68990a8e3 100644 --- a/redbot/cogs/audio/manager.py +++ b/redbot/cogs/audio/manager.py @@ -61,7 +61,6 @@ LAVALINK_DOWNLOAD_DIR: Final[pathlib.Path] = data_manager.cog_data_path(raw_name LAVALINK_JAR_FILE: Final[pathlib.Path] = LAVALINK_DOWNLOAD_DIR / "Lavalink.jar" LAVALINK_APP_YML: Final[pathlib.Path] = LAVALINK_DOWNLOAD_DIR / "application.yml" -_RE_READY_LINE: Final[Pattern] = re.compile(rb"Started Launcher in \S+ seconds") _FAILED_TO_START: Final[Pattern] = re.compile(rb"Web server failed to start\. (.*)") _RE_BUILD_LINE: Final[Pattern] = re.compile(rb"Build:\s+(?P\d+)") @@ -313,22 +312,12 @@ class ServerManager: async def _wait_for_launcher(self) -> None: log.info("Waiting for Managed Lavalink node to be ready") - # Since Lavalink jar 3.4.0_1346, there are two "Started Launcher" lines logged - # before Lavalink is ready to receive requests. - started_line_seen = False for i in itertools.cycle(range(50)): line = await self._proc.stdout.readline() - if _RE_READY_LINE.search(line): - if started_line_seen: - self.ready.set() - log.info("Managed Lavalink node is ready to receive requests.") - break - else: - log.debug( - "Seen first 'Started Launcher' line from Managed Lavalink node." - " Waiting for the second one..." - ) - started_line_seen = True + if b"Lavalink is ready to accept connections." in line: + self.ready.set() + log.info("Managed Lavalink node is ready to receive requests.") + break if _FAILED_TO_START.search(line): raise ManagedLavalinkStartFailure( f"Lavalink failed to start: {line.decode().strip()}"