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

Add a separate timeout for Lavalink download (#6461)

Browse Source 
Co-authored-by: chovin <chovin@users.noreply.github.com>
Co-authored-by: Jakub Kuczys <me@jacken.men>
This commit is contained in:
Chovin 2024-12-24 13:08:49 +10:00 committed by GitHub
parent fdaa869130
commit 1f48919005
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redbot/cogs/audio/core/tasks/lavalink.py
View File

@ -56,7 +56,9 @@ class LavalinkTasks(MixinMeta, metaclass=CompositeMetaClass):
password = configs["yaml"]["lavalink"]["server"]["password"] password = configs["yaml"]["lavalink"]["server"]["password"]
secured = False secured = False
# Make this timeout customizable for lower powered machines? # Make this timeout customizable for lower powered machines?
self.managed_node_controller = ServerManager(self.config, timeout=60, cog=self) self.managed_node_controller = ServerManager(
self.config, timeout=60, download_timeout=60 * 3, cog=self
)
try: try:
await self.managed_node_controller.start(java_exec) await self.managed_node_controller.start(java_exec)
# timeout is the same as ServerManager.timeout - # timeout is the same as ServerManager.timeout -

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

@ -125,13 +125,21 @@ class ServerManager:
_buildtime: ClassVar[Optional[str]] = None _buildtime: ClassVar[Optional[str]] = None
_java_exc: ClassVar[str] = "java" _java_exc: ClassVar[str] = "java"
def __init__(self, config: Config, cog: "Audio", timeout: Optional[int] = None) -> None: def __init__(
self,
config: Config,
cog: "Audio",
timeout: Optional[int] = None,
download_timeout: Optional[int] = None,
) -> None:
self.ready: asyncio.Event = asyncio.Event() self.ready: asyncio.Event = asyncio.Event()
self.downloaded: asyncio.Event = asyncio.Event()
self._config = config self._config = config
self._proc: Optional[asyncio.subprocess.Process] = None # pylint:disable=no-member self._proc: Optional[asyncio.subprocess.Process] = None # pylint:disable=no-member
self._shutdown: bool = False self._shutdown: bool = False
self.start_monitor_task = None self.start_monitor_task = None
self.timeout = timeout self.timeout = timeout
self.download_timeout = download_timeout
self.cog = cog self.cog = cog
self._args = [] self._args = []
self._pipe_task = None self._pipe_task = None
@ -357,6 +365,7 @@ class ServerManager:
async def _partial_shutdown(self) -> None: async def _partial_shutdown(self) -> None:
self.ready.clear() self.ready.clear()
self.downloaded.clear()
if self._shutdown is True: if self._shutdown is True:
# For convenience, calling this method more than once or calling it before starting it # For convenience, calling this method more than once or calling it before starting it
# does nothing. # does nothing.
@ -414,6 +423,7 @@ class ServerManager:
log.info("Successfully downloaded Lavalink.jar (%s bytes written)", format(nbytes, ",")) log.info("Successfully downloaded Lavalink.jar (%s bytes written)", format(nbytes, ","))
await self._is_up_to_date() await self._is_up_to_date()
self.downloaded.set()
async def _is_up_to_date(self): async def _is_up_to_date(self):
if self._up_to_date is True: if self._up_to_date is True:
@ -487,8 +497,14 @@ class ServerManager:
managed_node.JAR_VERSION, managed_node.JAR_VERSION,
) )
await self._download_jar() await self._download_jar()
else:
self.downloaded.set()
async def wait_until_ready(self, timeout: Optional[float] = None): async def wait_until_ready(
self, timeout: Optional[float] = None, download_timeout: Optional[float] = None
):
download_timeout = download_timeout or self.download_timeout
await asyncio.wait_for(self.downloaded.wait(), timeout=download_timeout)
await asyncio.wait_for(self.ready.wait(), timeout=timeout or self.timeout) await asyncio.wait_for(self.ready.wait(), timeout=timeout or self.timeout)
async def start_monitor(self, java_path: str): async def start_monitor(self, java_path: str):
@ -499,6 +515,7 @@ class ServerManager:
self._shutdown = False self._shutdown = False
if self._proc is None or self._proc.returncode is not None: if self._proc is None or self._proc.returncode is not None:
self.ready.clear() self.ready.clear()
self.downloaded.clear()
await self._start(java_path=java_path) await self._start(java_path=java_path)
while True: while True:
await self.wait_until_ready(timeout=self.timeout) await self.wait_until_ready(timeout=self.timeout)