technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixing leaked configuration objects.

Browse Source 
If there are no listen sockets, the router configuration usage counter
remains 0 and never decreases.  The only moment to release a configuration is
right after a configuration update.
This commit is contained in:
Max Romanov
2020-08-09 10:26:19 +03:00
parent 0f3abebd01
commit 3a721e1d96
1 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/nxt_router.c
View File

@@ -1208,13 +1208,39 @@ nxt_router_conf_wait(nxt_task_t *task, void *obj, void *data)
static void
nxt_router_conf_ready(nxt_task_t *task, nxt_router_temp_conf_t *tmcf)
{
nxt_debug(task, "temp conf count:%D", tmcf->count);
uint32_t count;
nxt_router_conf_t *rtcf;
nxt_thread_spinlock_t *lock;
if (--tmcf->count == 0) {
nxt_router_conf_send(task, tmcf, NXT_PORT_MSG_RPC_READY_LAST);
nxt_debug(task, "temp conf %p count: %D", tmcf, tmcf->count);
nxt_mp_destroy(tmcf->mem_pool);
if (--tmcf->count > 0) {
return;
}
nxt_router_conf_send(task, tmcf, NXT_PORT_MSG_RPC_READY_LAST);
rtcf = tmcf->router_conf;
lock = &rtcf->router->lock;
nxt_thread_spin_lock(lock);
count = rtcf->count;
nxt_thread_spin_unlock(lock);
nxt_debug(task, "rtcf %p: %D", rtcf, count);
if (count == 0) {
nxt_http_routes_cleanup(task, rtcf->routes);
nxt_router_access_log_release(task, lock, rtcf->access_log);
nxt_mp_destroy(rtcf->mem_pool);
}
nxt_mp_destroy(tmcf->mem_pool);
}