diff options
| -rw-r--r-- | bot/__main__.py | 9 | ||||
| -rw-r--r-- | bot/exts/moderation/defcon.py | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/bot/__main__.py b/bot/__main__.py index fc4475068..46850e78e 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -6,6 +6,7 @@ from async_rediscache import RedisSession from botcore import StartupError from botcore.site_api import APIClient from discord.ext import commands +from redis import RedisError import bot from bot import constants @@ -19,16 +20,16 @@ LOCALHOST = "127.0.0.1" async def _create_redis_session() -> RedisSession: """Create and connect to a redis session.""" redis_session = RedisSession( - address=(constants.Redis.host, constants.Redis.port), + host=constants.Redis.host, + port=constants.Redis.port, password=constants.Redis.password, - minsize=1, - maxsize=20, + max_connections=20, use_fakeredis=constants.Redis.use_fakeredis, global_namespace="bot", ) try: await redis_session.connect() - except OSError as e: + except RedisError as e: raise StartupError(e) return redis_session diff --git a/bot/exts/moderation/defcon.py b/bot/exts/moderation/defcon.py index 1df79149d..7c924ff14 100644 --- a/bot/exts/moderation/defcon.py +++ b/bot/exts/moderation/defcon.py @@ -6,7 +6,6 @@ from enum import Enum from typing import Optional, Union import arrow -from aioredis import RedisError from async_rediscache import RedisCache from botcore.utils import scheduling from botcore.utils.scheduling import Scheduler @@ -14,6 +13,7 @@ from dateutil.relativedelta import relativedelta from discord import Colour, Embed, Forbidden, Member, TextChannel, User from discord.ext import tasks from discord.ext.commands import Cog, Context, group, has_any_role +from redis import RedisError from bot.bot import Bot from bot.constants import Channels, Colours, Emojis, Event, Icons, MODERATION_ROLES, Roles |