static ngx_int_t ngx_resolver_set_timeout(ngx_resolver_t *r,
ngx_resolver_ctx_t *ctx);
static void ngx_resolver_timeout_handler(ngx_event_t *ev);
+static void ngx_resolver_free_handler(ngx_resolver_ctx_t *ctx);
static void ngx_resolver_free_node(ngx_resolver_t *r, ngx_resolver_node_t *rn);
static void *ngx_resolver_alloc(ngx_resolver_t *r, size_t size);
static void *ngx_resolver_calloc(ngx_resolver_t *r, size_t size);
w = w->next;
}
- ngx_log_error(NGX_LOG_ALERT, r->log, 0,
- "could not cancel %V resolving", &ctx->name);
+ ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
+ "could not cancel %V resolving", &ctx->name);
}
+
+ ctx->handler = ngx_resolver_free_handler;
}
done:
if (ctx->event) {
ngx_resolver_free_locked(r, ctx->event);
+ ctx->event = NULL;
}
- ngx_resolver_free_locked(r, ctx);
+ if (ctx->handler != ngx_resolver_free_handler) {
+ ngx_resolver_free_locked(r, ctx);
+ }
/* unlock alloc mutex */
}
}
+#if (NGX_DEBUG)
{
u_char text[NGX_SOCKADDR_STRLEN];
ngx_str_t addrtext;
addrtext.len = ngx_sock_ntop(ctx->addr.sockaddr, ctx->addr.socklen,
text, NGX_SOCKADDR_STRLEN, 0);
- ngx_log_error(NGX_LOG_ALERT, r->log, 0,
- "could not cancel %V resolving", &addrtext);
+ ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
+ "could not cancel %V resolving", &addrtext);
}
+#endif
+
+ ctx->handler = ngx_resolver_free_handler;
}
done:
if (ctx->event) {
ngx_resolver_free_locked(r, ctx->event);
+ ctx->event = NULL;
}
- ngx_resolver_free_locked(r, ctx);
+ if (ctx->handler != ngx_resolver_free_handler) {
+ ngx_resolver_free_locked(r, ctx);
+ }
/* unlock alloc mutex */
ngx_resolver_ctx_t *cctx;
ngx_resolver_srv_name_t *srvs;
+ if (ctx->handler == ngx_resolver_free_handler) {
+ ctx->handler(ctx);
+ return;
+ }
+
r = ctx->resolver;
ctx->node = NULL;
}
+static void
+ngx_resolver_free_handler(ngx_resolver_ctx_t *ctx)
+{
+ ngx_resolver_free(ctx->resolver, ctx);
+}
+
+
static void
ngx_resolver_free_node(ngx_resolver_t *r, ngx_resolver_node_t *rn)
{