Some fixes

This commit is contained in:
2024-02-11 12:41:41 +03:00
parent f3cdeeff3c
commit 883479b0d8
3 changed files with 11 additions and 9 deletions

16
main.py
View File

@@ -8,13 +8,13 @@ import aiohttp
from handlers.admin_commands import AdminCommands
from handlers.user_commands import UserCommands
from neuroapi.config import Config
from neuroapi.config import GlobalConfig as Config
from neuroapi.types import NeuroApiBot
async def delay_bot()->None:
if Config().token is None:
print('Delay bot needs token in environment')
logging.warning('Delay bot needs token in environment')
return
bot = NeuroApiBot(Config().token)
bot.include_router(AdminCommands, UserCommands)
@@ -22,7 +22,7 @@ async def delay_bot()->None:
async def proxy_bot()->None:
if Config().proxy_token is None:
print('Proxy bot needs token in environment')
logging.warning('Proxy bot needs token in environment')
return
bot = NeuroApiBot(Config().proxy_token)
bot.include_router()
@@ -30,30 +30,30 @@ async def proxy_bot()->None:
async def main() -> None:
for i in range(5):
print(f'Checking connectivity to backend ({i+1}/5)...')
logging.warning(f'Checking connectivity to backend ({i+1}/5)...')
try:
async with aiohttp.ClientSession() as session:
response = await session.get(Config().api_url+'/ping')
data = str(await response.content.read(), encoding='utf-8')
if data == 'pong':
print('Successfully connected to backend')
logging.warning('Successfully connected to backend')
break
else:
raise TimeoutError()
except:
print('Error! Waiting 3 secs and retrying...')
logging.error('Waiting 3 secs and retrying...')
await asyncio.sleep(3)
tasks = [asyncio.create_task(delay_bot()), asyncio.create_task(proxy_bot())]
await asyncio.gather(*tasks)
if __name__ == '__main__':
logging.basicConfig(level=logging.INFO, stream=sys.stdout)
logging.basicConfig(level=logging.WARNING, stream=sys.stdout, format='%(asctime)s %(levelname)s: %(message)s', datefmt='%d.%m.%Y %H:%M:%S')
loop = asyncio.get_event_loop()
if platform.system() == 'Windows':
try:
loop.run_until_complete(main())
except KeyboardInterrupt:
print("KeyboardInterrupt occurred")
logging.error("KeyboardInterrupt occurred")
finally:
loop.close()
else: