Throw threadpool out of the window

discordbot/titanembeds/bot.py

@@ -68,7 +68,7 @@ class Titan(discord.AutoShardedClient):
         await self.change_presence(status=discord.Status.online, activity=game)
 
         try:
-            await self.database.connect(config["database-uri"])
+            self.database.connect(config["database-uri"])
         except Exception:
             self.logger.error("Unable to connect to specified database!")
             traceback.print_exc()

discordbot/titanembeds/database/__init__.py

@@ -1,5 +1,4 @@
 from contextlib import contextmanager
-from asyncio_extras import threadpool
 import sqlalchemy as db
 from sqlalchemy.engine import Engine, create_engine
 from sqlalchemy.orm import sessionmaker, Session
@@ -26,26 +25,22 @@ class DatabaseInterface(object):
         self.engine = None  # type: Engine
         self._sessionmaker = None  # type: sessionmaker
 
-    async def connect(self, dburi):
-        async with threadpool():
+    def connect(self, dburi):
         self.engine = create_engine(dburi, pool_recycle=10)
-            self._sessionmaker = sessionmaker(bind=self.engine, expire_on_commit=False)
 
     @contextmanager
-    def get_session(self) -> Session:
-        session = self._sessionmaker()  # type: Session
+    def get_session(self):
+        Session = sessionmaker(bind=self.engine)
+        session = Session()
         try:
             yield session
-            session.commit()
         except:
             session.rollback()
-            raise
         finally:
-            session.close()
+            session.commit()
 
     async def push_message(self, message):
         if message.guild:
-            async with threadpool():
             with self.get_session() as session:
                 edit_ts = message.edited_at
                 if not edit_ts:
@@ -70,7 +65,6 @@ class DatabaseInterface(object):
 
     async def update_message(self, message):
         if message.guild:
-            async with threadpool():
             with self.get_session() as session:
                 msg = session.query(Messages) \
                     .filter(Messages.guild_id == message.guild.id) \
@@ -88,7 +82,6 @@ class DatabaseInterface(object):
 
     async def delete_message(self, message):
         if message.guild:
-            async with threadpool():
             with self.get_session() as session:
                 msg = session.query(Messages) \
                     .filter(Messages.guild_id == int(message.guild.id)) \
@@ -106,7 +99,6 @@ class DatabaseInterface(object):
                 server_webhooks = []
         else:
             server_webhooks = []
-        async with threadpool():
         with self.get_session() as session:
             gui = session.query(Guilds).filter(Guilds.guild_id == guild.id).first()
             if not gui:
@@ -132,7 +124,6 @@ class DatabaseInterface(object):
             session.commit()
 
     async def remove_unused_guilds(self, guilds):
-        async with threadpool():
         with self.get_session() as session:
             dbguilds = session.query(Guilds).all()
             changed = False
@@ -148,7 +139,6 @@ class DatabaseInterface(object):
                 session.commit()
 
     async def remove_guild(self, guild):
-        async with threadpool():
         with self.get_session() as session:
             gui = session.query(Guilds).filter(Guilds.guild_id == int(guild.id)).first()
             if gui:
@@ -157,7 +147,6 @@ class DatabaseInterface(object):
                 session.commit()
 
     async def update_guild_member(self, member, active=True, banned=False, guild=None):
-        async with threadpool():
         with self.get_session() as session:
             if guild:
                 dbmember = session.query(GuildMembers) \
@@ -198,7 +187,6 @@ class DatabaseInterface(object):
             session.commit()
 
     async def unban_server_user(self, user, server):
-        async with threadpool():
         with self.get_session() as session:
             dbmember = session.query(GuildMembers) \
                 .filter(GuildMembers.guild_id == int(server.id)) \
@@ -208,7 +196,6 @@ class DatabaseInterface(object):
                 session.commit()
 
     async def flag_unactive_guild_members(self, guild_id, guild_members):
-        async with threadpool():
         with self.get_session() as session:
             changed = False
             dbmembers = session.query(GuildMembers) \
@@ -223,7 +210,6 @@ class DatabaseInterface(object):
                 session.commit()
 
     async def flag_unactive_bans(self, guild_id, guildbans):
-        async with threadpool():
         with self.get_session() as session:
             changed = False
             for usr in guildbans:
@@ -251,7 +237,6 @@ class DatabaseInterface(object):
                 session.commit()
 
     async def ban_unauth_user_by_query(self, guild_id, placer_id, username, discriminator):
-        async with threadpool():
         with self.get_session() as session:
             dbuser = None
             if discriminator:
@@ -281,7 +266,6 @@ class DatabaseInterface(object):
             return "Guest user, **{}#{}**, has successfully been added to the ban list!".format(dbban.last_username, dbban.last_discriminator)
 
     async def revoke_unauth_user_by_query(self, guild_id, username, discriminator):
-        async with threadpool():
         with self.get_session() as session:
             dbuser = None
             if discriminator:
@@ -304,7 +288,6 @@ class DatabaseInterface(object):
             return "Successfully kicked **{}#{}**!".format(dbuser.username, dbuser.discriminator)
                 
     async def delete_all_messages_from_channel(self, channel_id):
-        async with threadpool():
         with self.get_session() as session:
             session.query(Messages).filter(Messages.channel_id == int(channel_id)).delete()
             session.commit()