Banish RabbitMQ from this world

6 files changed, 1 insertions, 296 deletions

diff --git a/bot/__main__.py b/bot/__main__.py
index 8687cc62c..8afec2718 100644
--- a/bot/__main__.py
+++ b/bot/__main__.py
@@ -8,7 +8,6 @@ from discord.ext.commands import Bot, when_mentioned_or
 
 from bot.api import APIClient
 from bot.constants import Bot as BotConfig, DEBUG_MODE
-from bot.utils.service_discovery import wait_for_rmq
 
 
 log = logging.getLogger(__name__)
@@ -31,14 +30,6 @@ bot.http_session = ClientSession(
 )
 bot.api_client = APIClient(loop=asyncio.get_event_loop())
 
-log.info("Waiting for RabbitMQ...")
-has_rmq = wait_for_rmq()
-
-if has_rmq:
-    log.info("RabbitMQ found")
-else:
-    log.warning("Timed out while waiting for RabbitMQ")
-
 # Internal/debug
 bot.load_extension("bot.cogs.logging")
 bot.load_extension("bot.cogs.security")
@@ -80,9 +71,6 @@ bot.load_extension("bot.cogs.token_remover")
 bot.load_extension("bot.cogs.utils")
 bot.load_extension("bot.cogs.wolfram")
 
-if has_rmq:
-    bot.load_extension("bot.cogs.rmq")
-
 bot.run(BotConfig.token)
 
 bot.http_session.close()  # Close the aiohttp session when the bot finishes running
diff --git a/bot/cogs/rmq.py b/bot/cogs/rmq.py
deleted file mode 100644
index 2742fb969..000000000
--- a/bot/cogs/rmq.py
+++ /dev/null
@@ -1,229 +0,0 @@
-import asyncio
-import datetime
-import json
-import logging
-import pprint
-
-import aio_pika
-from aio_pika import Message
-from dateutil import parser as date_parser
-from discord import Colour, Embed
-from discord.ext.commands import Bot
-from discord.utils import get
-
-from bot.constants import Channels, Guild, RabbitMQ
-
-log = logging.getLogger(__name__)
-
-LEVEL_COLOURS = {
-    "debug": Colour.blue(),
-    "info": Colour.green(),
-    "warning": Colour.gold(),
-    "error": Colour.red()
-}
-
-DEFAULT_LEVEL_COLOUR = Colour.greyple()
-EMBED_PARAMS = (
-    "colour", "title", "url", "description", "timestamp"
-)
-
-CONSUME_TIMEOUT = datetime.timedelta(seconds=10)
-
-
-class RMQ:
-    """
-    RabbitMQ event handling
-    """
-
-    rmq = None  # type: aio_pika.Connection
-    channel = None  # type: aio_pika.Channel
-    queue = None  # type: aio_pika.Queue
-
-    def __init__(self, bot: Bot):
-        self.bot = bot
-
-    async def on_ready(self):
-        self.rmq = await aio_pika.connect_robust(
-            host=RabbitMQ.host, port=RabbitMQ.port, login=RabbitMQ.username, password=RabbitMQ.password
-        )
-
-        log.info("Connected to RabbitMQ")
-
-        self.channel = await self.rmq.channel()
-        self.queue = await self.channel.declare_queue("bot_events", durable=True)
-
-        log.debug("Channel opened, queue declared")
-
-        async for message in self.queue:
-            with message.process():
-                message.ack()
-                await self.handle_message(message, message.body.decode())
-
-    async def send_text(self, queue: str, data: str):
-        message = Message(data.encode("utf-8"))
-        await self.channel.default_exchange.publish(message, queue)
-
-    async def send_json(self, queue: str, **data):
-        message = Message(json.dumps(data).encode("utf-8"))
-        await self.channel.default_exchange.publish(message, queue)
-
-    async def consume(self, queue: str, **kwargs):
-        queue_obj = await self.channel.declare_queue(queue, **kwargs)
-
-        result = None
-        start_time = datetime.datetime.now()
-
-        while result is None:
-            if datetime.datetime.now() - start_time >= CONSUME_TIMEOUT:
-                result = "Timed out while waiting for a response."
-            else:
-                result = await queue_obj.get(timeout=5, fail=False)
-                await asyncio.sleep(0.5)
-
-        if result:
-            result.ack()
-
-        return result
-
-    async def handle_message(self, message, data):
-        log.debug(f"Message: {message}")
-        log.debug(f"Data: {data}")
-
-        try:
-            data = json.loads(data)
-        except Exception:
-            await self.do_mod_log("error", "Unable to parse event", data)
-        else:
-            event = data["event"]
-            event_data = data["data"]
-
-            try:
-                func = getattr(self, f"do_{event}")
-                await func(**event_data)
-            except Exception as e:
-                await self.do_mod_log(
-                    "error", f"Unable to handle event: {event}",
-                    str(e)
-                )
-
-    async def do_mod_log(self, level: str, title: str, message: str):
-        colour = LEVEL_COLOURS.get(level, DEFAULT_LEVEL_COLOUR)
-        embed = Embed(
-            title=title, description=f"```\n{message}\n```",
-            colour=colour, timestamp=datetime.datetime.now()
-        )
-
-        await self.bot.get_channel(Channels.modlog).send(embed=embed)
-        log.log(logging._nameToLevel[level.upper()], f"Modlog: {title} | {message}")
-
-    async def do_send_message(self, target: int, message: str):
-        channel = self.bot.get_channel(target)
-
-        if channel is None:
-            await self.do_mod_log(
-                "error", "Failed: Send Message",
-                f"Unable to find channel: {target}"
-            )
-        else:
-            await channel.send(message)
-
-            await self.do_mod_log(
-                "info", "Succeeded: Send Embed",
-                f"Message sent to channel {target}\n\n{message}"
-            )
-
-    async def do_send_embed(self, target: int, **embed_params):
-        for param, value in list(embed_params.items()):  # To keep a full copy
-            if param not in EMBED_PARAMS:
-                await self.do_mod_log(
-                    "warning", "Warning: Send Embed",
-                    f"Unknown embed parameter: {param}"
-                )
-                del embed_params[param]
-
-            if param == "timestamp":
-                embed_params[param] = date_parser.parse(value)
-            elif param == "colour":
-                embed_params[param] = Colour(value)
-
-        channel = self.bot.get_channel(target)
-
-        if channel is None:
-            await self.do_mod_log(
-                "error", "Failed: Send Embed",
-                f"Unable to find channel: {target}"
-            )
-        else:
-            await channel.send(embed=Embed(**embed_params))
-
-            await self.do_mod_log(
-                "info", "Succeeded: Send Embed",
-                f"Embed sent to channel {target}\n\n{pprint.pformat(embed_params, 4)}"
-            )
-
-    async def do_add_role(self, target: int, role_id: int, reason: str):
-        guild = self.bot.get_guild(Guild.id)
-        member = guild.get_member(int(target))
-
-        if member is None:
-            return await self.do_mod_log(
-                "error", "Failed: Add Role",
-                f"Unable to find member: {target}"
-            )
-
-        role = get(guild.roles, id=int(role_id))
-
-        if role is None:
-            return await self.do_mod_log(
-                "error", "Failed: Add Role",
-                f"Unable to find role: {role_id}"
-            )
-
-        try:
-            await member.add_roles(role, reason=reason)
-        except Exception as e:
-            await self.do_mod_log(
-                "error", "Failed: Add Role",
-                f"Error while adding role {role.name}: {e}"
-            )
-        else:
-            await self.do_mod_log(
-                "info", "Succeeded: Add Role",
-                f"Role {role.name} added to member {target}"
-            )
-
-    async def do_remove_role(self, target: int, role_id: int, reason: str):
-        guild = self.bot.get_guild(Guild.id)
-        member = guild.get_member(int(target))
-
-        if member is None:
-            return await self.do_mod_log(
-                "error", "Failed: Remove Role",
-                f"Unable to find member: {target}"
-            )
-
-        role = get(guild.roles, id=int(role_id))
-
-        if role is None:
-            return await self.do_mod_log(
-                "error", "Failed: Remove Role",
-                f"Unable to find role: {role_id}"
-            )
-
-        try:
-            await member.remove_roles(role, reason=reason)
-        except Exception as e:
-            await self.do_mod_log(
-                "error", "Failed: Remove Role",
-                f"Error while adding role {role.name}: {e}"
-            )
-        else:
-            await self.do_mod_log(
-                "info", "Succeeded: Remove Role",
-                f"Role {role.name} removed from member {target}"
-            )
-
-
-def setup(bot):
-    bot.add_cog(RMQ(bot))
-    log.info("Cog loaded: RMQ")
diff --git a/bot/cogs/snekbox.py b/bot/cogs/snekbox.py
index cb0454249..1988303f1 100644
--- a/bot/cogs/snekbox.py
+++ b/bot/cogs/snekbox.py
@@ -9,7 +9,6 @@ from discord.ext.commands import (
     Bot, CommandError, Context, NoPrivateMessage, command, guild_only
 )
 
-from bot.cogs.rmq import RMQ
 from bot.constants import Channels, ERROR_REPLIES, NEGATIVE_REPLIES, Roles, URLs
 from bot.decorators import InChannelCheckFailure, in_channel
 from bot.utils.messages import wait_for_deletion
@@ -17,12 +16,6 @@ from bot.utils.messages import wait_for_deletion
 
 log = logging.getLogger(__name__)
 
-RMQ_ARGS = {
-    "durable": False,
-    "arguments": {"x-message-ttl": 5000},
-    "auto_delete": True
-}
-
 CODE_TEMPLATE = """
 venv_file = "/snekbox/.venv/bin/activate_this.py"
 exec(open(venv_file).read(), dict(__file__=venv_file))
@@ -64,10 +57,6 @@ class Snekbox:
         self.bot = bot
         self.jobs = {}
 
-    @property
-    def rmq(self) -> RMQ:
-        return self.bot.get_cog("RMQ")
-
     @command(name='eval', aliases=('e',))
     @guild_only()
     @in_channel(Channels.bot, bypass_roles=BYPASS_ROLES)
@@ -107,13 +96,8 @@ class Snekbox:
         code = CODE_TEMPLATE.replace("{CODE}", code)
 
         try:
-            await self.rmq.send_json(
-                "input",
-                snekid=str(ctx.author.id), message=code
-            )
-
             async with ctx.typing():
-                message = await self.rmq.consume(str(ctx.author.id), **RMQ_ARGS)
+                message = ...  # TODO
                 paste_link = None
 
                 if isinstance(message, str):
diff --git a/bot/constants.py b/bot/constants.py
index d2e3bb315..3ceecab85 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -374,15 +374,6 @@ class Keys(metaclass=YAMLGetter):
     youtube: str
 
 
-class RabbitMQ(metaclass=YAMLGetter):
-    section = "rabbitmq"
-
-    host: str
-    password: str
-    port: int
-    username: str
-
-
 class URLs(metaclass=YAMLGetter):
     section = "urls"
 
diff --git a/bot/utils/service_discovery.py b/bot/utils/service_discovery.py
deleted file mode 100644
index 8d79096bd..000000000
--- a/bot/utils/service_discovery.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import datetime
-import socket
-import time
-from contextlib import closing
-
-from bot.constants import RabbitMQ
-
-THIRTY_SECONDS = datetime.timedelta(seconds=30)
-
-
-def wait_for_rmq():
-    start = datetime.datetime.now()
-
-    while True:
-        if datetime.datetime.now() - start > THIRTY_SECONDS:
-            return False
-
-        with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as sock:
-            if sock.connect_ex((RabbitMQ.host, RabbitMQ.port)) == 0:
-                return True
-
-        time.sleep(0.5)
diff --git a/config-default.yml b/config-default.yml
index f6481cfcd..8d9d0f999 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -204,13 +204,6 @@ keys:
     youtube:     !ENV "YOUTUBE_API_KEY"
 
 
-rabbitmq:
-    host:          "pdrmq"
-    password: !ENV ["RABBITMQ_DEFAULT_PASS", "guest"]
-    port:          5672
-    username: !ENV ["RABBITMQ_DEFAULT_USER", "guest"]
-
-
 urls:
     # PyDis site vars
     site:        &DOMAIN       "pythondiscord.com"