mirror of
https://gitlab.com/chicken-riders/RcGcDb.git
synced 2025-02-22 00:44:10 +00:00
Change used exception type for one of the errors
This commit is contained in:
parent
c8080e60b3
commit
0b3a868640
|
@ -11,8 +11,7 @@ import sys
|
||||||
|
|
||||||
import aiohttp
|
import aiohttp
|
||||||
|
|
||||||
from src.exceptions import WikiOnTimeout
|
from src.exceptions import WikiNotFoundError, WikiOnTimeout, NoAvailableWiki
|
||||||
from src.exceptions import WikiNotFoundError
|
|
||||||
from src.misc import LimitedList
|
from src.misc import LimitedList
|
||||||
from src.discord.message import DiscordMessage
|
from src.discord.message import DiscordMessage
|
||||||
from src.config import settings
|
from src.config import settings
|
||||||
|
@ -61,7 +60,8 @@ class Domain:
|
||||||
"msgdelay": {"min": min(self.message_timings or [0]), "avg": int(sum(self.message_timings)/(len(self.message_timings) or 1)),
|
"msgdelay": {"min": min(self.message_timings or [0]), "avg": int(sum(self.message_timings)/(len(self.message_timings) or 1)),
|
||||||
"max": max(self.message_timings or [0])},
|
"max": max(self.message_timings or [0])},
|
||||||
"discord_messages": self.total_discord_messages_sent,
|
"discord_messages": self.total_discord_messages_sent,
|
||||||
"last_failure_report": self.last_failure_report
|
"last_failure_report": self.last_failure_report,
|
||||||
|
"wikis_on_timeout": [name for name, value in self.wikis.items() if value.is_on_timeout()]
|
||||||
}
|
}
|
||||||
return dict_obj
|
return dict_obj
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
|
@ -135,7 +135,7 @@ class Domain:
|
||||||
:raises StopIteration: When None has been passed as wiki, means there are no more wikis in the queue besides timeouted ones
|
:raises StopIteration: When None has been passed as wiki, means there are no more wikis in the queue besides timeouted ones
|
||||||
"""
|
"""
|
||||||
if wiki is None:
|
if wiki is None:
|
||||||
raise StopIteration
|
raise NoAvailableWiki
|
||||||
try:
|
try:
|
||||||
await wiki.scan()
|
await wiki.scan()
|
||||||
except WikiNotFoundError as e:
|
except WikiNotFoundError as e:
|
||||||
|
@ -233,7 +233,7 @@ class Domain:
|
||||||
while True:
|
while True:
|
||||||
await asyncio.sleep(self.calculate_sleep_time(len(self))) # To make sure that we don't spam domains with one wiki every second we calculate a sane timeout for domains with few wikis
|
await asyncio.sleep(self.calculate_sleep_time(len(self))) # To make sure that we don't spam domains with one wiki every second we calculate a sane timeout for domains with few wikis
|
||||||
await self.run_wiki_scan(self.find_first_not_on_timeout(), "regular check")
|
await self.run_wiki_scan(self.find_first_not_on_timeout(), "regular check")
|
||||||
except StopIteration:
|
except NoAvailableWiki:
|
||||||
logger.debug(f"Domain {self.name} received StopIteration, returning from regular_scheduler...")
|
logger.debug(f"Domain {self.name} received StopIteration, returning from regular_scheduler...")
|
||||||
return
|
return
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|
|
@ -26,6 +26,9 @@ class OtherWikiError(Exception):
|
||||||
class QueueEmpty(Exception):
|
class QueueEmpty(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
class NoAvailableWiki(Exception):
|
||||||
|
pass
|
||||||
|
|
||||||
class ListFull(Exception):
|
class ListFull(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue