should have logging and startup fixed
This commit is contained in:
parent
9cae625cc2
commit
3f30f13ad7
2 changed files with 18 additions and 14 deletions
|
|
@ -7,6 +7,7 @@ from dotenv import load_dotenv
|
||||||
import aiohttp
|
import aiohttp
|
||||||
import src.logger as logger
|
import src.logger as logger
|
||||||
|
|
||||||
|
|
||||||
load_dotenv()
|
load_dotenv()
|
||||||
discord_token = os.getenv('discord_token')
|
discord_token = os.getenv('discord_token')
|
||||||
|
|
||||||
|
|
@ -23,17 +24,15 @@ async def folder_setup():
|
||||||
if not os.path.exists(folder_name):
|
if not os.path.exists(folder_name):
|
||||||
os.mkdir(folder_name)
|
os.mkdir(folder_name)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.exception(f"Error setting up folders: {e}")
|
bot.logger.exception(f"Error setting up folders: {e}")
|
||||||
|
|
||||||
async def delete_all_files(path):
|
async def delete_all_files(path):
|
||||||
try:
|
try:
|
||||||
for filename in os.listdir(path):
|
for filename in os.listdir(path):
|
||||||
if os.path.isdir(path+filename):
|
if os.path.isfile(path+filename):
|
||||||
shutil.rmtree(path+filename)
|
|
||||||
elif os.path.isfile(path+filename):
|
|
||||||
os.remove(path+filename)
|
os.remove(path+filename)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.exception(f"Error deleting files: {e}")
|
bot.logger.exception(f"Error deleting files: {e}")
|
||||||
|
|
||||||
@tasks.loop(seconds=1) # Run the task every second
|
@tasks.loop(seconds=1) # Run the task every second
|
||||||
async def task_loop():
|
async def task_loop():
|
||||||
|
|
@ -42,9 +41,9 @@ async def task_loop():
|
||||||
#Run daily tasks
|
#Run daily tasks
|
||||||
if current_time.tm_hour == 0 and current_time.tm_min == 0 and current_time.tm_sec == 0:
|
if current_time.tm_hour == 0 and current_time.tm_min == 0 and current_time.tm_sec == 0:
|
||||||
await delete_all_files("tmp/")
|
await delete_all_files("tmp/")
|
||||||
logger.info("Deleted tmp/ files.")
|
bot.logger.info("Deleted tmp/ files.")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.exception(f"Error in task loop: {e}")
|
bot.logger.exception(f"Error in task loop: {e}")
|
||||||
|
|
||||||
async def create_session():
|
async def create_session():
|
||||||
return aiohttp.ClientSession()
|
return aiohttp.ClientSession()
|
||||||
|
|
@ -64,28 +63,28 @@ async def on_resumed():
|
||||||
async def on_disconnect():
|
async def on_disconnect():
|
||||||
await close_session(bot.http_session)
|
await close_session(bot.http_session)
|
||||||
|
|
||||||
def logger_setup():
|
def logger_setup(logger):
|
||||||
if not os.path.isdir("logs"):
|
if not os.path.isdir("logs"):
|
||||||
os.mkdir("logs")
|
os.mkdir("logs")
|
||||||
with open("logs/info.log", "a") as f:
|
with open("logs/info.log", "a") as f:
|
||||||
pass
|
pass
|
||||||
logger = logger.logging.getLogger("bot")
|
logger = logger.logging.getLogger("bot")
|
||||||
bot.logger = logger
|
return logger
|
||||||
|
|
||||||
|
|
||||||
@bot.event
|
@bot.event
|
||||||
async def on_ready():
|
async def on_ready():
|
||||||
try:
|
try:
|
||||||
await folder_setup()
|
|
||||||
await delete_all_files("tmp/")
|
await delete_all_files("tmp/")
|
||||||
|
await folder_setup()
|
||||||
# Import plugins from extensions folder
|
# Import plugins from extensions folder
|
||||||
for plugin_file in os.listdir('extensions/'):
|
for plugin_file in os.listdir('extensions/'):
|
||||||
if plugin_file[0] != '_' and plugin_file[-3:] == '.py':
|
if plugin_file[0] != '_' and plugin_file[-3:] == '.py':
|
||||||
await bot.load_extension(f'extensions.{plugin_file[:-3]}')
|
await bot.load_extension(f'extensions.{plugin_file[:-3]}')
|
||||||
logger.info('We have logged in as {0.user}'.format(bot))
|
bot.logger.info('We have logged in as {0.user}'.format(bot))
|
||||||
task_loop.start()
|
task_loop.start()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(f"Error in on_ready: {e}")
|
bot.logger.warning(f"Error in on_ready: {e}")
|
||||||
raise
|
raise
|
||||||
|
|
||||||
@bot.event
|
@bot.event
|
||||||
|
|
@ -95,10 +94,10 @@ async def on_message(ctx):
|
||||||
except commands.CommandNotFound:
|
except commands.CommandNotFound:
|
||||||
pass
|
pass
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(f"Error processing commands: {e}")
|
bot.logger.warning(f"Error processing commands: {e}")
|
||||||
|
|
||||||
|
bot.logger = logger_setup(logger)
|
||||||
try:
|
try:
|
||||||
logger_setup()
|
|
||||||
bot.run(discord_token, root_logger=True)
|
bot.run(discord_token, root_logger=True)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.critical(f"Fatal error running bot: {e}")
|
logger.critical(f"Fatal error running bot: {e}")
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import logging
|
import logging
|
||||||
|
import os
|
||||||
from logging.config import dictConfig
|
from logging.config import dictConfig
|
||||||
|
|
||||||
LOGGING_CONFIG = {
|
LOGGING_CONFIG = {
|
||||||
|
|
@ -40,4 +41,8 @@ LOGGING_CONFIG = {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if not os.path.isdir("logs"):
|
||||||
|
os.mkdir("logs")
|
||||||
|
with open("logs/info.log", "a") as f:
|
||||||
|
pass
|
||||||
dictConfig(LOGGING_CONFIG)
|
dictConfig(LOGGING_CONFIG)
|
||||||
Loading…
Add table
Add a link
Reference in a new issue