diff --git a/Dockerfile b/Dockerfile index 5697fa9..7c7ab0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,4 @@ COPY requirements.txt /botname/ RUN pip install -r /botname/requirements.txt COPY . /botname/ -CMD python3 /botname/bot.py +CMD python3 /botname/app.py diff --git a/app.py b/app.py new file mode 100644 index 0000000..86b3963 --- /dev/null +++ b/app.py @@ -0,0 +1,23 @@ +from loader import bot, storage + + +async def on_startup(dp): + import filters + import middlewares + filters.setup(dp) + middlewares.setup(dp) + + from utils.notify_admins import on_startup_notify + await on_startup_notify(dp) + + +async def on_shutdown(dp): + await bot.close() + await storage.close() + + +if __name__ == '__main__': + from aiogram import executor + from handlers import dp + + executor.start_polling(dp, on_startup=on_startup) diff --git a/handlers/errors/error_handler.py b/handlers/errors/error_handler.py index c361bc1..57ce53c 100644 --- a/handlers/errors/error_handler.py +++ b/handlers/errors/error_handler.py @@ -1,6 +1,6 @@ import logging -from bot import dp +from loader import dp @dp.errors_handler() diff --git a/handlers/users/echo.py b/handlers/users/echo.py index b147304..158a106 100644 --- a/handlers/users/echo.py +++ b/handlers/users/echo.py @@ -1,5 +1,5 @@ from aiogram import types -from bot import dp +from loader import dp @dp.message_handler() diff --git a/handlers/users/help.py b/handlers/users/help.py index 19e739a..7b0cf36 100644 --- a/handlers/users/help.py +++ b/handlers/users/help.py @@ -1,7 +1,7 @@ from aiogram import types from aiogram.dispatcher.filters.builtin import CommandStart -from bot import dp +from loader import dp from utils.misc import rate_limit diff --git a/handlers/users/start.py b/handlers/users/start.py index 922113d..54abb72 100644 --- a/handlers/users/start.py +++ b/handlers/users/start.py @@ -1,7 +1,7 @@ from aiogram import types from aiogram.dispatcher.filters.builtin import CommandStart -from bot import dp +from loader import dp @dp.message_handler(CommandStart()) diff --git a/bot.py b/loader.py similarity index 54% rename from bot.py rename to loader.py index 393d96c..f409ca8 100644 --- a/bot.py +++ b/loader.py @@ -12,25 +12,3 @@ logging.basicConfig(format=u'%(filename)s [LINE:%(lineno)d] #%(levelname)-8s [%( level=logging.INFO, # level=logging.DEBUG, ) - - -async def on_startup(dp): - import filters - import middlewares - filters.setup(dp) - middlewares.setup(dp) - - from utils.notify_admins import on_startup_notify - await on_startup_notify(dp) - - -async def on_shutdown(dp): - await bot.close() - await storage.close() - - -if __name__ == '__main__': - from aiogram import executor - from handlers import dp - - executor.start_polling(dp, on_startup=on_startup)