CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-12-06 01:12:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

[3.4] Use the new ready line from LL dev build 1352+ (#5775) (#5826)

Browse Source 
* Revert "Wait for two 'Started Launcher' lines before connecting to managed LL (#5751)"

This reverts commit cf85a6470f.

* Use the new ready line from LL dev build 1352+
(cherry picked from commit a32f10d758)

Co-authored-by: Jakub Kuczys <6032823+jack1142@users.noreply.github.com>
This commit is contained in:
Jakub Kuczys
2022-08-14 21:12:16 +02:00
committed by GitHub
parent ab767dbee5
commit af0da1b380
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
redbot/cogs/audio/manager.py
View File

@@ -35,7 +35,6 @@ LAVALINK_JAR_FILE: Final[pathlib.Path] = LAVALINK_DOWNLOAD_DIR / "Lavalink.jar"
BUNDLED_APP_YML: Final[pathlib.Path] = pathlib.Path(__file__).parent / "data" / "application.yml" BUNDLED_APP_YML: Final[pathlib.Path] = pathlib.Path(__file__).parent / "data" / "application.yml"
LAVALINK_APP_YML: Final[pathlib.Path] = LAVALINK_DOWNLOAD_DIR / "application.yml" 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\. (.*)") _FAILED_TO_START: Final[Pattern] = re.compile(rb"Web server failed to start\. (.*)")
_RE_BUILD_LINE: Final[Pattern] = re.compile(rb"Build:\s+(?P<build>\d+)") _RE_BUILD_LINE: Final[Pattern] = re.compile(rb"Build:\s+(?P<build>\d+)")
@@ -230,22 +229,12 @@ class ServerManager:
async def _wait_for_launcher(self) -> None: async def _wait_for_launcher(self) -> None:
log.debug("Waiting for Lavalink server to be ready") log.debug("Waiting for Lavalink server to be ready")
lastmessage = 0 lastmessage = 0
# 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)): for i in itertools.cycle(range(50)):
line = await self._proc.stdout.readline() line = await self._proc.stdout.readline()
if _RE_READY_LINE.search(line): if b"Lavalink is ready to accept connections." in line:
if started_line_seen:
self.ready.set() self.ready.set()
log.info("Internal Lavalink server is ready to receive requests.") log.info("Internal Lavalink server is ready to receive requests.")
break break
else:
log.debug(
"Seen first 'Started Launcher' line from internal Lavalink server."
" Waiting for the second one..."
)
started_line_seen = True
if _FAILED_TO_START.search(line): if _FAILED_TO_START.search(line):
raise RuntimeError(f"Lavalink failed to start: {line.decode().strip()}") raise RuntimeError(f"Lavalink failed to start: {line.decode().strip()}")
if self._proc.returncode is not None and lastmessage + 2 < time.time(): if self._proc.returncode is not None and lastmessage + 2 < time.time():