[njs] Fetch: refactored out ngx_js_http_close_peer().
noreply at nginx.com
noreply at nginx.com
Fri Apr 11 15:29:02 UTC 2025
details: https://github.com/nginx/njs/commit/78b55af1e689eac4c87961a65592a094845ed482
branches: master
commit: 78b55af1e689eac4c87961a65592a094845ed482
user: Zhidao HONG <z.hong at f5.com>
date: Fri, 11 Apr 2025 22:02:16 +0800
description:
Fetch: refactored out ngx_js_http_close_peer().
---
nginx/ngx_js_fetch.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/nginx/ngx_js_fetch.c b/nginx/ngx_js_fetch.c
index d3f8b356..944ed28e 100644
--- a/nginx/ngx_js_fetch.c
+++ b/nginx/ngx_js_fetch.c
@@ -164,6 +164,7 @@ static njs_int_t ngx_js_headers_fill(njs_vm_t *vm, ngx_js_headers_t *headers,
static ngx_js_http_t *ngx_js_http_alloc(njs_vm_t *vm, ngx_pool_t *pool,
ngx_log_t *log);
static void ngx_js_http_resolve_done(ngx_js_http_t *http);
+static void ngx_js_http_close_peer(ngx_js_http_t *http);
static void ngx_js_http_destructor(ngx_js_event_t *event);
static void ngx_js_resolve_handler(ngx_resolver_ctx_t *ctx);
static njs_int_t ngx_js_fetch_promissified_result(njs_vm_t *vm,
@@ -1456,6 +1457,16 @@ ngx_js_http_resolve_done(ngx_js_http_t *http)
}
+static void
+ngx_js_http_close_peer(ngx_js_http_t *http)
+{
+ if (http->peer.connection != NULL) {
+ ngx_js_http_close_connection(http->peer.connection);
+ http->peer.connection = NULL;
+ }
+}
+
+
static void
ngx_js_http_destructor(ngx_js_event_t *event)
{
@@ -1467,11 +1478,7 @@ ngx_js_http_destructor(ngx_js_event_t *event)
http);
ngx_js_http_resolve_done(http);
-
- if (http->peer.connection != NULL) {
- ngx_js_http_close_connection(http->peer.connection);
- http->peer.connection = NULL;
- }
+ ngx_js_http_close_peer(http);
}
@@ -1532,10 +1539,7 @@ ngx_js_http_fetch_done(ngx_js_http_t *http, njs_opaque_value_t *retval,
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, http->log, 0,
"js fetch done http:%p rc:%i", http, (ngx_int_t) rc);
- if (http->peer.connection != NULL) {
- ngx_js_http_close_connection(http->peer.connection);
- http->peer.connection = NULL;
- }
+ ngx_js_http_close_peer(http);
if (http->event != NULL) {
action = &http->promise_callbacks[(rc != NJS_OK)];
More information about the nginx-devel
mailing list