some settings renames

This commit is contained in:
Jörn-Michael Miehe 2022-09-09 02:41:15 +00:00
parent 564bac8ea4
commit f36272a6c0
4 changed files with 10 additions and 7 deletions

View file

@ -40,7 +40,7 @@ def get_ttl_hash() -> int:
https://stackoverflow.com/a/55900800 https://stackoverflow.com/a/55900800
""" """
return round(time() / SETTINGS.cache_seconds) return round(time() / SETTINGS.cache_time)
def timed_alru_cache(*decorator_args, **decorator_kwargs): def timed_alru_cache(*decorator_args, **decorator_kwargs):

View file

@ -9,13 +9,16 @@ from fastapi import APIRouter
from ..settings import SETTINGS from ..settings import SETTINGS
from . import aggregate, calendar, image, misc, text, ticker from . import aggregate, calendar, image, misc, text, ticker
main_router = APIRouter(prefix=f"/{SETTINGS.api_v1_prefix}") main_router = APIRouter(prefix=f"/{SETTINGS.api_prefix}")
main_router.include_router(misc.router)
main_router.include_router(text.router) main_router.include_router(text.router)
main_router.include_router(ticker.router) main_router.include_router(ticker.router)
main_router.include_router(image.router) main_router.include_router(image.router)
main_router.include_router(calendar.router) main_router.include_router(calendar.router)
main_router.include_router(aggregate.router) main_router.include_router(aggregate.router)
main_router.include_router(misc.router)
__all__ = [ __all__ = [
"main_router", "main_router",

View file

@ -31,7 +31,7 @@ async def get_ip() -> str:
) as s: ) as s:
s.settimeout(0) s.settimeout(0)
try: try:
s.connect((SETTINGS.ping_address, SETTINGS.ping_port)) s.connect((SETTINGS.ping_host, SETTINGS.ping_port))
IP = s.getsockname()[0] IP = s.getsockname()[0]
except Exception: except Exception:

View file

@ -49,14 +49,14 @@ class Settings(BaseSettings):
production_mode: bool = False production_mode: bool = False
log_level: str = "INFO" if production_mode else "DEBUG" log_level: str = "INFO" if production_mode else "DEBUG"
cache_seconds: int = 30 cache_time: int = 30
cache_size: int = 30 cache_size: int = 30
# doesn't even have to be reachable # doesn't even have to be reachable
ping_address: str = "10.0.0.0" ping_host: str = "10.0.0.0"
ping_port: int = 1 ping_port: int = 1
api_v1_prefix: str = "api/v1" api_prefix: str = "api/v1"
openapi_url: str = "/openapi.json" openapi_url: str = "/openapi.json"
docs_url: Optional[str] = None if production_mode else "/docs" docs_url: Optional[str] = None if production_mode else "/docs"
redoc_url: Optional[str] = None if production_mode else "/redoc" redoc_url: Optional[str] = None if production_mode else "/redoc"