Skip to content

Commit

Permalink
less verbose debug logs
Browse files Browse the repository at this point in the history
  • Loading branch information
paulineribeyre committed Jan 24, 2025
1 parent 378823d commit 371bb72
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
"filename": "gen3workflow/config-default.yaml",
"hashed_secret": "afc848c316af1a89d49826c5ae9d00ed769415f3",
"is_verified": false,
"line_number": 37
"line_number": 39
}
],
"migrations/versions/e1886270d9d2_create_system_key_table.py": [
Expand Down Expand Up @@ -209,5 +209,5 @@
}
]
},
"generated_at": "2025-01-09T21:36:04Z"
"generated_at": "2025-01-24T23:29:16Z"
}
7 changes: 6 additions & 1 deletion gen3workflow/app.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from fastapi import FastAPI
import httpx
from importlib.metadata import version
import logging
import os

from cdislogging import get_logger
Expand All @@ -24,10 +25,14 @@ def get_app(httpx_client=None) -> FastAPI:
app = FastAPI(
title="Gen3Workflow",
version=version("gen3workflow"),
debug=debug,
debug=config["DEBUG"],
root_path=config["DOCS_URL_PREFIX"],
)

# httpx_logger = logging.getLogger("httpx")
# httpx_logger.setLevel(logging.WARNING)
app.async_client = httpx_client or httpx.AsyncClient()

app.include_router(ga4gh_tes_router, tags=["GA4GH TES"])
app.include_router(s3_router, tags=["S3"])
app.include_router(storage_router, tags=["Storage"])
Expand Down
2 changes: 2 additions & 0 deletions gen3workflow/config-default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

HOSTNAME: localhost
DEBUG: false
# gunicorn debug mode is very verbose, so the setting is separate from the main app debug mode
GUNICORN_DEBUG: false
DOCS_URL_PREFIX: /gen3workflow

# override the default Arborist URL; ignored if already set as an environment variable
Expand Down
1 change: 1 addition & 0 deletions gen3workflow/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def validate_top_level_configs(self) -> None:
"properties": {
"HOSTNAME": {"type": "string"},
"DEBUG": {"type": "boolean"},
"GUNICORN_DEBUG": {"type": "boolean"},
"DOCS_URL_PREFIX": {"type": "string"},
"ARBORIST_URL": {"type": ["string", "null"]},
"MOCK_AUTH": {"type": "boolean"},
Expand Down
8 changes: 6 additions & 2 deletions gunicorn.conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,17 @@ def __init__(self, cfg):

self._remove_handlers(logging.getLogger())
cdislogging.get_logger(
None, log_level="debug" if app_config["DEBUG"] else "warn"
None,
log_level="debug" if app_config["GUNICORN_DEBUG"] else "warn",
# None,
# log_level="warn",
)
for logger_name in ["gunicorn", "gunicorn.error", "gunicorn.access"]:
self._remove_handlers(logging.getLogger(logger_name))
cdislogging.get_logger(
logger_name,
log_level="debug" if app_config["DEBUG"] else "info",
# log_level="debug" if app_config["DEBUG"] else "info",
log_level="info",
)


Expand Down

0 comments on commit 371bb72

Please sign in to comment.