sergey
/
netadm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactoring

This commit is contained in:
s.mostryukov 2024-10-01 17:48:12 +03:00
parent d1bc1fdf18
commit 8fbec57acb
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.py
View File

@ -20,10 +20,6 @@ class RunConfig(BaseModel):
reload: bool = True reload: bool = True
class PrefixConfig(BaseModel):
swagger: str = "/docs"
class SwaggerConfig(BaseModel): class SwaggerConfig(BaseModel):
openapi_url: str = "/openapi.json" openapi_url: str = "/openapi.json"
title: str = "Netadm API" title: str = "Netadm API"
@ -45,7 +41,6 @@ class Settings(BaseSettings):
) )
run: RunConfig = RunConfig() run: RunConfig = RunConfig()
swagger: SwaggerConfig = SwaggerConfig() swagger: SwaggerConfig = SwaggerConfig()
prefix: PrefixConfig = PrefixConfig()
settings = Settings() settings = Settings()

21
main.py
View File

@ -1,30 +1,11 @@
import logging import logging
from config import settings, STATIC_DIR from config import settings, STATIC_DIR
from scripts.сheck_available_ports import start_check
import uvicorn import uvicorn
from fastapi import FastAPI from fastapi import FastAPI
from fastapi.responses import ORJSONResponse from fastapi.responses import ORJSONResponse
from starlette.staticfiles import StaticFiles from starlette.staticfiles import StaticFiles
from web.routers import router as web_router from web.routers import router as web_router
input_text = """
Info;1001-12:00:17;Сущетвует разрешенная трансляция 37.18.15.119:13081/tcp и это хорошо.
Info;1001-12:00:17;Сущетвует разрешенная трансляция 46.17.253.143:3305/tcp и это хорошо.
Info;1001-12:00:17;Сущетвует разрешенная трансляция 37.18.15.119:18080/tcp и это хорошо.
Error;1001-12:00:17;Сущетвует разрешенная трансляция 188.92.104.110:1554/tcp и это хорошо.
Error;1001-12:00:17;Информация о 46.243.234.23:1555/tcp есть в реестре, но нет в результатах сканирования.
Error;1001-12:00:17;Информация о 46.243.234.23:13081/tcp есть в реестре, но нет в результатах сканирования.
Info;1001-12:00:17;Script finished
"""
main_app = FastAPI( main_app = FastAPI(
default_response_class=ORJSONResponse, default_response_class=ORJSONResponse,
docs_url=None, docs_url=None,
@ -37,9 +18,11 @@ main_app.mount("/static", StaticFiles(directory=STATIC_DIR), name="static")
if __name__ == "__main__": if __name__ == "__main__":
logging.info("Starting server")
uvicorn.run( uvicorn.run(
"main:main_app", "main:main_app",
host=settings.run.host, host=settings.run.host,
port=settings.run.port, port=settings.run.port,
reload=settings.run.reload, reload=settings.run.reload,
) )
logging.info("Server stopped")