xevion/linkpulse
1
0
Fork 0
mirror of https://github.com/Xevion/linkpulse.git synced 2025-12-13 06:11:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Switch main app loggers to structlog, fix improper structlogs

Browse Source
This commit is contained in:
Xevion
2024-11-01 15:09:15 -05:00
parent f93df47b67
commit bcb1441251
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
backend/linkpulse/app.py
View File

@@ -17,6 +17,7 @@ from fastapi import FastAPI, Request, Response, status
from fastapi_cache import FastAPICache from fastapi_cache import FastAPICache
from fastapi_cache.backends.inmemory import InMemoryBackend from fastapi_cache.backends.inmemory import InMemoryBackend
from fastapi_cache.decorator import cache from fastapi_cache.decorator import cache
import structlog
from linkpulse.utilities import get_ip, hide_ip, pluralize from linkpulse.utilities import get_ip, hide_ip, pluralize
from linkpulse.middleware import LoggingMiddleware from linkpulse.middleware import LoggingMiddleware
from peewee import PostgresqlDatabase from peewee import PostgresqlDatabase
@@ -32,7 +33,6 @@ from linkpulse import models, responses # type: ignore
# global variables # global variables
is_development = os.getenv("ENVIRONMENT") == "development" is_development = os.getenv("ENVIRONMENT") == "development"
db: PostgresqlDatabase = models.BaseModel._meta.database # type: ignore db: PostgresqlDatabase = models.BaseModel._meta.database # type: ignore
logger = logging.getLogger()
def flush_ips(): def flush_ips():
@@ -57,11 +57,11 @@ def flush_ips():
cur = db.cursor() cur = db.cursor()
execute_values(cur, sql, rows) execute_values(cur, sql, rows)
except: except Exception as e:
logging.error("Failed to flush IPs to the database.") logging.error("Failed to flush IPs to Database", {"error": str(e)})
i = len(app.state.buffered_updates) i = len(app.state.buffered_updates)
logging.debug("Flushed {} IP{} to the database.".format(i, pluralize(i))) logging.debug("Flushed IPs to Database", {"count": i, "ip": pluralize(i, "IP")})
# Finish up # Finish up
app.state.buffered_updates.clear() app.state.buffered_updates.clear()
@@ -87,15 +87,12 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
# Delete all randomly generated IP addresses # Delete all randomly generated IP addresses
with db.atomic(): with db.atomic():
logger.info( logger.info("Deleting Randomized IP Addresses", ip_pool_count=len(app.state.ip_pool))
"Deleting Randomized IP Addresses",
{"ip_pool_count": len(app.state.ip_pool)},
)
query = models.IPAddress.delete().where( query = models.IPAddress.delete().where(
models.IPAddress.ip << app.state.ip_pool models.IPAddress.ip << app.state.ip_pool
) )
row_count = query.execute() row_count = query.execute()
logger.info("Randomized IP Addresses deleted", {"row_count": row_count}) logger.info("Randomized IP Addresses deleted", row_count=row_count)
FastAPICache.init( FastAPICache.init(
backend=InMemoryBackend(), prefix="fastapi-cache", cache_status_header="X-Cache" backend=InMemoryBackend(), prefix="fastapi-cache", cache_status_header="X-Cache"
@@ -125,6 +122,8 @@ app = FastAPI(lifespan=lifespan)
setup_logging() setup_logging()
logger = structlog.get_logger()
if is_development: if is_development:
from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.cors import CORSMiddleware