Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 52e559da authored by Vidas DAUDARAVICIUS's avatar Vidas DAUDARAVICIUS
Browse files

Merge branch 'logging' into 'development'

Set logging level in main.

See merge request !4
parents 06fb8406 fbfa87a0
No related branches found
No related tags found
1 merge request!4Set logging level in main.
import logging
from fastapi import APIRouter, Depends, HTTPException, status
import os
from admin.models.index import Index
from admin.models.response_message import ResponseStatus, ResponseMessage
......@@ -9,8 +8,8 @@ from admin.internal import opensearch
router = APIRouter()
logger = logging.getLogger(__name__)
logger.setLevel(os.environ.get("LOG_LEVEL",default=logger.getEffectiveLevel()))
logger = logging.getLogger("admin")
@router.post(
"/indexes",
......
import logging
from fastapi import APIRouter, Depends, HTTPException, status
import os
from admin.models.response_message import ResponseStatus, ResponseMessage
from admin.internal import opensearch
router = APIRouter()
logger = logging.getLogger(__name__)
logger.setLevel(os.environ.get("LOG_LEVEL",default=logger.getEffectiveLevel()))
logger = logging.getLogger("admin")
@router.post(
"/cleanup",
......
......@@ -12,20 +12,20 @@ level=INFO
handlers=consoleHandler
[logger_admin]
level=DEBUG
level=INFO
handlers=detailedConsoleHandler
qualname=admin
propagate=0
[handler_consoleHandler]
class=StreamHandler
level=DEBUG
level=INFO
formatter=normalFormatter
args=(sys.stdout,)
[handler_detailedConsoleHandler]
class=StreamHandler
level=DEBUG
level=INFO
formatter=detailedFormatter
args=(sys.stdout,)
......
import time
import logging
import logging.config
import random
import string
import os
......@@ -12,16 +13,18 @@ from admin.routers.testing import router as testing_router
# setup loggers
logging.config.fileConfig("/etc/seta/logging.conf", disable_existing_loggers=False)
logging.getLogger().setLevel(os.environ.get("LOG_LEVEL",default=logging.getLogger().getEffectiveLevel()))
log_level = os.environ.get("LOG_LEVEL", default=logging.getLogger().getEffectiveLevel())
root_logger = logging.getLogger()
root_logger.setLevel(log_level)
admin_logger = logging.getLogger("admin")
admin_logger.setLevel(log_level)
def create_app() -> FastAPI:
"""Web service app factory"""
# get root logger
logger = logging.getLogger(__name__)
logger.setLevel(os.environ.get("LOG_LEVEL",default=logger.getEffectiveLevel()))
app = FastAPI(
root_path="/seta-admin", title="Internal Administration", version="0.0.1"
)
......@@ -31,14 +34,14 @@ def create_app() -> FastAPI:
"""Logs the time every request takes."""
idem = "".join(random.choices(string.ascii_uppercase + string.digits, k=6))
logger.info("rid=%s start request path=%s", idem, request.url.path)
admin_logger.info("rid=%s start request path=%s", idem, request.url.path)
start_time = time.time()
response = await call_next(request)
process_time = (time.time() - start_time) * 1000
formatted_process_time = f"{process_time:.2f}"
logger.info(
admin_logger.info(
"rid=%s completed_in=%sms status_code=%s",
idem,
formatted_process_time,
......@@ -52,6 +55,6 @@ def create_app() -> FastAPI:
if configuration.stage.lower() == "test":
app.include_router(testing_router, tags=["testing"])
logger.info("FastAPI initialized.")
root_logger.info("FastAPI initialized.")
return app
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment