Skip to content

Commit 73d47be

Browse files
committed
Fix Github actions and access log missing entries
1 parent 945e458 commit 73d47be

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,11 @@ setup-docker:
111111
stop:
112112
docker compose -f $(DOCKER_COMPOSE_MAIN) down --remove-orphans
113113
# Stop local processes
114+
ifndef GITHUB_ACTIONS
114115
pkill -f "custom-echo-server.js" 2>/dev/null || true
115116
pkill -f "extproc_mock" 2>/dev/null || true
117+
endif
118+
116119

117120
# Testing targets
118121
test:

src/modules/bbr.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,20 +171,28 @@ pub unsafe extern "C" fn bbr_body_read_handler(r: *mut ngx::ffi::ngx_http_reques
171171
if (*r).headers_out.status
172172
== ngx::ffi::NGX_HTTP_REQUEST_ENTITY_TOO_LARGE as ngx::ffi::ngx_uint_t
173173
{
174-
// 413 error - send special response so access logging runs
174+
// 413 error - send special response and finalize so access logging runs
175175
ngx::ffi::ngx_http_special_response_handler(
176176
r,
177177
ngx::ffi::NGX_HTTP_REQUEST_ENTITY_TOO_LARGE as ngx::ffi::ngx_int_t,
178178
);
179+
ngx::ffi::ngx_http_finalize_request(
180+
r,
181+
ngx::ffi::NGX_HTTP_REQUEST_ENTITY_TOO_LARGE as ngx::ffi::ngx_int_t,
182+
);
179183
return;
180184
} else {
181-
// Other error - set 500 and send special response so access logging runs
185+
// Other error - set 500, send special response and finalize so access logging runs
182186
(*r).headers_out.status =
183187
ngx::ffi::NGX_HTTP_INTERNAL_SERVER_ERROR as ngx::ffi::ngx_uint_t;
184188
ngx::ffi::ngx_http_special_response_handler(
185189
r,
186190
ngx::ffi::NGX_HTTP_INTERNAL_SERVER_ERROR as ngx::ffi::ngx_int_t,
187191
);
192+
ngx::ffi::ngx_http_finalize_request(
193+
r,
194+
ngx::ffi::NGX_HTTP_INTERNAL_SERVER_ERROR as ngx::ffi::ngx_int_t,
195+
);
188196
return;
189197
}
190198
}

0 commit comments

Comments
 (0)