Skip to content

Commit fbb5f5a

Browse files
author
Bryan Sieber
committed
Add additional logging to request before calling action; modify logging when IgnoreInvalidRequestError happens.
1 parent c81cb70 commit fbb5f5a

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/app/log.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ def configure_logging():
3131
"loggers": {
3232
"request.summary": {"handlers": ["console"], "level": "INFO"},
3333
"src.jbi": {"handlers": ["console"], "level": "INFO"},
34+
"ignored-requests": {"handlers": ["console"], "level": "DEBUG"},
3435
},
3536
}
3637

src/jbi/router.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
api_router = APIRouter(tags=["JBI"])
2222

2323
jbi_logger = logging.getLogger("src.jbi.router")
24+
invalid_logger = logging.getLogger("ignored-requests")
2425

2526

2627
def extract_current_action( # pylint: disable=inconsistent-return-statements
@@ -58,11 +59,12 @@ def execute_action(request: BugzillaWebhookRequest, action_map, settings):
5859
callable_action = action_module.init( # type: ignore
5960
**current_action["parameters"]
6061
)
62+
jbi_logger.info("request: %s", request.json())
6163
content = callable_action(payload=request)
6264
jbi_logger.info("request: %s, content: %s", request.json(), content)
6365
return JSONResponse(content=content, status_code=200)
6466
except IgnoreInvalidRequestError as exception:
65-
jbi_logger.info("ignore-invalid-request: %s", exception, exc_info=True)
67+
invalid_logger.debug("ignore-invalid-request: %s", exception)
6668
return JSONResponse(content={"error": str(exception)}, status_code=202)
6769

6870

tests/unit/jbi/test_router.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def test_request_is_ignored_because_private(
2828
assert response.json()["error"] == "private bugs are not valid"
2929

3030
invalid_request_logs = caplog.records[0]
31-
assert invalid_request_logs.name == "src.jbi.router"
31+
assert invalid_request_logs.name == "ignored-requests"
3232

3333
assert invalid_request_logs.msg == "ignore-invalid-request: %s"
3434
assert invalid_request_logs.args
@@ -53,7 +53,7 @@ def test_request_is_ignored_because_no_bug(
5353
assert response.json()["error"] == "no bug data received"
5454

5555
invalid_request_logs = caplog.records[0]
56-
assert invalid_request_logs.name == "src.jbi.router"
56+
assert invalid_request_logs.name == "ignored-requests"
5757

5858
assert invalid_request_logs.msg == "ignore-invalid-request: %s"
5959
assert invalid_request_logs.args
@@ -85,7 +85,7 @@ def test_request_is_ignored_because_no_action(
8585
)
8686

8787
invalid_request_logs = caplog.records[0]
88-
assert invalid_request_logs.name == "src.jbi.router"
88+
assert invalid_request_logs.name == "ignored-requests"
8989

9090
assert invalid_request_logs.msg == "ignore-invalid-request: %s"
9191
assert invalid_request_logs.args

0 commit comments

Comments
 (0)