Correctly clear resource from pool and context on log

Author: joelwurtz

src/ngx_http_redirectionio_module.c

@@ -208,7 +208,7 @@ static ngx_int_t ngx_http_redirectionio_redirect_handler(ngx_http_request_t *r)
 
     if (ctx->connection_error) {
         if (ctx->resource != NULL) {
-            ngx_http_redirectionio_release_resource(conf->connection_pool, ctx->resource, 1);
+            ngx_http_redirectionio_release_resource(conf->connection_pool, ctx, 1);
         }
 
         ctx->wait_for_connection = 0;
@@ -247,10 +247,7 @@ static ngx_int_t ngx_http_redirectionio_redirect_handler(ngx_http_request_t *r)
         return NGX_AGAIN;
     }
 
-    ngx_http_redirectionio_release_resource(conf->connection_pool, ctx->resource, 0);
-
-    ctx->wait_for_connection = 0;
-    ctx->resource = NULL;
+    ngx_http_redirectionio_release_resource(conf->connection_pool, ctx, 0);
 
     if (ctx->status == 0 || ctx->match_on_response_status != 0) {
         return NGX_DECLINED;

src/ngx_http_redirectionio_module.h

@@ -78,7 +78,7 @@ ngx_int_t ngx_http_redirectionio_pool_construct(void **resource, void *params);
 ngx_int_t ngx_http_redirectionio_pool_destruct(void *resource, void *params);
 ngx_int_t ngx_http_redirectionio_pool_available(ngx_reslist_t *reslist, void *resource, void *data, ngx_int_t deferred);
 ngx_int_t ngx_http_redirectionio_pool_available_log_handler(ngx_reslist_t *reslist, void *resource, void *data, ngx_int_t deferred);
-void ngx_http_redirectionio_release_resource(ngx_reslist_t *reslist, ngx_http_redirectionio_resource_t *resource, ngx_uint_t in_error);
+void ngx_http_redirectionio_release_resource(ngx_reslist_t *reslist, ngx_http_redirectionio_ctx_t *ctx, ngx_uint_t in_error);
 void ngx_http_redirectionio_read_handler(ngx_event_t *rev);
 void ngx_http_redirectionio_read_binary_handler(ngx_event_t *rev);
 

src/ngx_http_redirectionio_module_filter.c

@@ -103,11 +103,7 @@ ngx_int_t ngx_http_redirectionio_headers_filter(ngx_http_request_t *r) {
 
     // Check connection
     if (ctx->connection_error) {
-        ngx_http_redirectionio_release_resource(conf->connection_pool, ctx->resource, 1);
-
-        ctx->wait_for_connection = 0;
-        ctx->resource = NULL;
-        ctx->connection_error = 0;
+        ngx_http_redirectionio_release_resource(conf->connection_pool, ctx, 1);
 
         return ngx_http_next_header_filter(r);
     }
@@ -182,11 +178,7 @@ ngx_int_t ngx_http_redirectionio_body_filter(ngx_http_request_t *r, ngx_chain_t
 
     // Check connection
     if (ctx->connection_error) {
-        ngx_http_redirectionio_release_resource(conf->connection_pool, ctx->resource, 1);
-
-        ctx->wait_for_connection = 0;
-        ctx->resource = NULL;
-        ctx->connection_error = 0;
+        ngx_http_redirectionio_release_resource(conf->connection_pool, ctx, 1);
 
         return ngx_http_next_body_filter(r, ctx->body_buffer);
     }
@@ -270,7 +262,7 @@ static void ngx_http_redirectionio_read_filter_headers_handler(ngx_event_t *rev,
     ctx->wait_for_header_filtering = 0;
 
     if (json == NULL) {
-        ngx_http_redirectionio_release_resource(conf->connection_pool, ctx->resource, 1);
+        ngx_http_redirectionio_release_resource(conf->connection_pool, ctx, 1);
         ngx_http_redirectionio_finalize_request(r, ctx);
 
         return;
@@ -279,7 +271,7 @@ static void ngx_http_redirectionio_read_filter_headers_handler(ngx_event_t *rev,
     headers = cJSON_GetObjectItem(json, "headers");
 
     if (headers == NULL || headers->type != cJSON_Array) {
-        ngx_http_redirectionio_release_resource(conf->connection_pool, ctx->resource, 1);
+        ngx_http_redirectionio_release_resource(conf->connection_pool, ctx, 1);
         ngx_http_redirectionio_finalize_request(r, ctx);
 
         return;
@@ -332,9 +324,7 @@ static void ngx_http_redirectionio_read_filter_headers_handler(ngx_event_t *rev,
         h->value.len = strlen(value->valuestring);
     }
 
-    ngx_http_redirectionio_release_resource(conf->connection_pool, ctx->resource, 0);
-    ctx->wait_for_connection = 0;
-    ctx->resource = NULL;
+    ngx_http_redirectionio_release_resource(conf->connection_pool, ctx, 0);
 
     ngx_http_redirectionio_finalize_request(r, ctx);
 }
@@ -359,8 +349,7 @@ static void ngx_http_redirectionio_read_filter_body_handler(ngx_event_t *rev, u_
     // If buffer is last or errored -> send a last empty buffer, finalize request and release resource
     if (buffer_size < 0) {
         if (ctx->resource != NULL) {
-            ngx_http_redirectionio_release_resource(conf->connection_pool, ctx->resource, (buffer_size == -1) ? 0 : 1);
-            ctx->resource = NULL;
+            ngx_http_redirectionio_release_resource(conf->connection_pool, ctx, (buffer_size == -1) ? 0 : 1);
         }
 
         new_chain = ngx_alloc_chain_link(r->pool);

src/ngx_http_redirectionio_module_pool.c

@@ -107,38 +107,38 @@ ngx_int_t ngx_http_redirectionio_pool_available(ngx_reslist_t *reslist, void *re
 }
 
 ngx_int_t ngx_http_redirectionio_pool_available_log_handler(ngx_reslist_t *reslist, void *resource, void *data, ngx_int_t deferred) {
-    ngx_http_redirectionio_log_t    *log = (ngx_http_redirectionio_log_t *)data;
-    ngx_peer_connection_t           *peer = (ngx_peer_connection_t *)resource;
+    ngx_http_redirectionio_log_t       *log = (ngx_http_redirectionio_log_t *)data;
+    ngx_http_redirectionio_resource_t  *rr = (ngx_http_redirectionio_resource_t *)resource;
 
-    if (peer == NULL) {
+    if (rr == NULL) {
         ngx_http_redirectionio_protocol_free_log(log);
 
         return NGX_ERROR;
     }
 
-    ngx_http_redirectionio_protocol_send_log(peer->connection, log);
+    ngx_http_redirectionio_protocol_send_log(rr->peer.connection, log);
     ngx_http_redirectionio_protocol_free_log(log);
-    ngx_http_redirectionio_release_resource(reslist, resource, 0);
+    ngx_reslist_release(reslist, rr);
 
     return NGX_OK;
 }
 
-void ngx_http_redirectionio_release_resource(ngx_reslist_t *reslist, ngx_http_redirectionio_resource_t *resource, ngx_uint_t in_error) {
-    if (in_error) {
-        ngx_reslist_invalidate(reslist, resource);
-
+void ngx_http_redirectionio_release_resource(ngx_reslist_t *reslist, ngx_http_redirectionio_ctx_t *ctx, ngx_uint_t in_error) {
+    if (ctx->resource == NULL) {
         return;
     }
 
-    resource->usage++;
-
-    if (resource->usage > NGX_HTTP_REDIRECTIONIO_RESOURCE_MAX_USAGE) {
-        ngx_reslist_invalidate(reslist, resource);
+    ctx->resource->usage++;
 
-        return;
+    if (!in_error && ctx->resource->usage < NGX_HTTP_REDIRECTIONIO_RESOURCE_MAX_USAGE) {
+        ngx_reslist_release(reslist, ctx->resource);
+    } else {
+        ngx_reslist_invalidate(reslist, ctx->resource);
     }
 
-    ngx_reslist_release(reslist, resource);
+    ctx->resource = NULL;
+    ctx->wait_for_connection = 0;
+    ctx->connection_error = 0;
 }
 
 static ngx_int_t ngx_http_redirectionio_get_connection(ngx_peer_connection_t *pc, void *data) {