rewrite: Cleanup main.

Also attach a `ClientSession` to LionBot.
This commit is contained in:
2022-11-18 08:47:34 +02:00
parent 65fb271dde
commit dfa3ef6ec6

View File

@@ -1,10 +1,12 @@
import asyncio import asyncio
import logging import logging
import aiohttp
import discord import discord
from discord.ext import commands from discord.ext import commands
from meta import LionBot, conf, sharding, appname, shard_talk from meta import LionBot, conf, sharding, appname, shard_talk
from meta.app import shardname
from meta.logger import log_context, log_action_stack, logging_context from meta.logger import log_context, log_action_stack, logging_context
from meta.context import ctx_bot from meta.context import ctx_bot
@@ -12,20 +14,6 @@ from data import Database
from constants import DATA_VERSION from constants import DATA_VERSION
# from data import tables
# Note: This MUST be imported after core, due to table definition orders
# from settings import AppSettings
# log_context.set(f"APP: {appname}")
# client.appdata = core.data.meta.fetch_or_create(appname)
# client.data = tables
# client.settings = AppSettings(conf.bot['data_appid'])
# Initialise all modules
# client.initialise_modules()
for name in conf.config.options('LOGGING_LEVELS', no_defaults=True): for name in conf.config.options('LOGGING_LEVELS', no_defaults=True):
logging.getLogger(name).setLevel(conf.logging_levels[name]) logging.getLogger(name).setLevel(conf.logging_levels[name])
@@ -50,16 +38,18 @@ async def main():
logger.critical(error) logger.critical(error)
raise RuntimeError(error) raise RuntimeError(error)
async with aiohttp.ClientSession() as session:
async with LionBot( async with LionBot(
command_prefix=commands.when_mentioned, command_prefix=commands.when_mentioned,
intents=intents, intents=intents,
appname=appname, appname=appname,
shardname=shardname,
db=db, db=db,
config=conf, config=conf,
initial_extensions=['modules'], initial_extensions=['core', 'modules'],
web_client=None, web_client=session,
app_ipc=shard_talk, app_ipc=shard_talk,
testing_guilds=[889875661848723456, 879411098384752672], testing_guilds=conf.bot.getintlist('admin_guilds'),
shard_id=sharding.shard_number, shard_id=sharding.shard_number,
shard_count=sharding.shard_count shard_count=sharding.shard_count
) as lionbot: ) as lionbot: