Properly check server

This commit is contained in:
Nexus 2024-04-14 18:09:50 +01:00
parent 7b72ced147
commit e1a2f97e7f
Signed by: nex
GPG key ID: 0FA334385D0B689F

View file

@ -496,9 +496,7 @@ class Ollama(commands.Cog):
async def check_server(self, url: str) -> bool: async def check_server(self, url: str) -> bool:
"""Checks that a server is online and responding.""" """Checks that a server is online and responding."""
if url in SERVER_KEYS: if url in SERVER_KEYS:
_u = url
url = CONFIG["ollama"][url]["base_url"] url = CONFIG["ollama"][url]["base_url"]
self.log.warning("Resolved 'url' %s to %s", _u, url)
async with aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(10)) as session: async with aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(10)) as session:
self.log.debug("Checking if %r is online.", url) self.log.debug("Checking if %r is online.", url)
try: try:
@ -953,7 +951,7 @@ class Ollama(commands.Cog):
server = self.next_server(False) server = self.next_server(False)
while not await self.check_server(server): while not await self.check_server(server):
server = self.next_server() server = self.next_server()
if server: if await self.check_server(server):
break break
else: else:
return await ctx.respond("All servers are offline. Please try again later.", ephemeral=True) return await ctx.respond("All servers are offline. Please try again later.", ephemeral=True)