Skip to content

Commit 9324993

Browse files
chore: remove aiomonitor and update packages
1 parent 9477ac3 commit 9324993

File tree

4 files changed

+518
-545
lines changed

4 files changed

+518
-545
lines changed

config.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
load_dotenv()
1010

1111

12-
MONITOR = config("MONITOR", default=False, cast=bool)
1312
SQLALCHEMY_DATABASE_URL = config("SQLALCHEMY_DATABASE_URL", default="sqlite+aiosqlite:///db.sqlite3")
1413
SQLALCHEMY_POOL_SIZE = config("SQLALCHEMY_POOL_SIZE", cast=int, default=10)
1514
SQLALCHEMY_MAX_OVERFLOW = config("SQLALCHEMY_MAX_OVERFLOW", cast=int, default=30)

main.py

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import asyncio
21
import ipaddress
32
import logging
43
import os
@@ -15,7 +14,6 @@
1514
from app.utils.logger import LOGGING_CONFIG
1615
from config import (
1716
DEBUG,
18-
MONITOR,
1917
UVICORN_HOST,
2018
UVICORN_LOOP,
2119
UVICORN_PORT,
@@ -141,37 +139,14 @@ def validate_cert_and_key(cert_file_path, key_file_path):
141139
LOGGING_CONFIG["loggers"]["uvicorn.error"]["level"] = log_level
142140
LOGGING_CONFIG["loggers"]["uvicorn.access"]["level"] = log_level
143141

144-
async def main():
145-
import aiomonitor
146-
147-
config = uvicorn.Config(
148-
app,
142+
try:
143+
uvicorn.run(
144+
"main:app",
149145
**bind_args,
150146
workers=1,
151147
reload=DEBUG,
152148
log_config=LOGGING_CONFIG,
153-
loop="asyncio",
149+
loop=UVICORN_LOOP,
154150
)
155-
server = uvicorn.Server(config)
156-
157-
loop = asyncio.get_running_loop()
158-
run_forever = loop.create_future()
159-
160-
with aiomonitor.start_monitor(loop):
161-
await server.serve()
162-
await run_forever
163-
164-
if MONITOR:
165-
asyncio.run(main())
166-
else:
167-
try:
168-
uvicorn.run(
169-
"main:app",
170-
**bind_args,
171-
workers=1,
172-
reload=DEBUG,
173-
log_config=LOGGING_CONFIG,
174-
loop=UVICORN_LOOP,
175-
)
176-
except FileNotFoundError: # to prevent error on removing unix sock
177-
pass
151+
except FileNotFoundError: # to prevent error on removing unix sock
152+
pass

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ dependencies = [
4444
"aiohttp-socks>=0.10.1",
4545
"uvloop>=0.21.0; sys_platform != 'win32'",
4646
"aiorwlock>=1.5.0",
47-
"aiomonitor>=0.7.1",
4847
"typer>=0.17.3",
4948
"pasarguard-node-bridge>=0.0.48",
5049
]

0 commit comments

Comments
 (0)