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

Fixing access_log structure reference counting.

Browse Source 
The reference to the access_log structure is stored in the current
nxt_router_conf_t and the global nxt_router_t.  When the reference is copied,
the reference counter should be adjusted accordingly.

This closes #593 issue on GitHub.
This commit is contained in:
Max Romanov
2021-11-25 16:58:43 +03:00
parent aaa34e0a64
commit 1c0436d644
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/changes.xml
View File

@@ -31,6 +31,13 @@ NGINX Unit updated to 1.26.1.
date="" time="" date="" time=""
packager="Andrei Belov <defan@nginx.com>"> packager="Andrei Belov <defan@nginx.com>">
<change type="bugfix">
<para>
the router process crash on reconfiguration if "access_log" was configured
without listeners.
</para>
</change>
</changes> </changes>

28
src/nxt_router.c
View File

@@ -210,6 +210,8 @@ static void nxt_router_access_log_ready(nxt_task_t *task,
nxt_port_recv_msg_t *msg, void *data); nxt_port_recv_msg_t *msg, void *data);
static void nxt_router_access_log_error(nxt_task_t *task, static void nxt_router_access_log_error(nxt_task_t *task,
nxt_port_recv_msg_t *msg, void *data); nxt_port_recv_msg_t *msg, void *data);
static void nxt_router_access_log_use(nxt_thread_spinlock_t *lock,
nxt_router_access_log_t *access_log);
static void nxt_router_access_log_release(nxt_task_t *task, static void nxt_router_access_log_release(nxt_task_t *task,
nxt_thread_spinlock_t *lock, nxt_router_access_log_t *access_log); nxt_thread_spinlock_t *lock, nxt_router_access_log_t *access_log);
static void nxt_router_access_log_reopen_completion(nxt_task_t *task, void *obj, static void nxt_router_access_log_reopen_completion(nxt_task_t *task, void *obj,
@@ -1149,7 +1151,13 @@ nxt_router_conf_apply(nxt_task_t *task, void *obj, void *data)
nxt_queue_add(&router->sockets, &updating_sockets); nxt_queue_add(&router->sockets, &updating_sockets);
nxt_queue_add(&router->sockets, &creating_sockets); nxt_queue_add(&router->sockets, &creating_sockets);
if (router->access_log != rtcf->access_log) {
nxt_router_access_log_use(&router->lock, rtcf->access_log);
nxt_router_access_log_release(task, &router->lock, router->access_log);
router->access_log = rtcf->access_log; router->access_log = rtcf->access_log;
}
nxt_router_conf_ready(task, tmcf); nxt_router_conf_ready(task, tmcf);
@@ -1971,9 +1979,7 @@ nxt_router_conf_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
access_log = router->access_log; access_log = router->access_log;
if (access_log != NULL && nxt_strstr_eq(&path, &access_log->path)) { if (access_log != NULL && nxt_strstr_eq(&path, &access_log->path)) {
nxt_thread_spin_lock(&router->lock); nxt_router_access_log_use(&router->lock, access_log);
access_log->count++;
nxt_thread_spin_unlock(&router->lock);
} else { } else {
access_log = nxt_malloc(sizeof(nxt_router_access_log_t) access_log = nxt_malloc(sizeof(nxt_router_access_log_t)
@@ -3922,6 +3928,22 @@ nxt_router_access_log_error(nxt_task_t *task, nxt_port_recv_msg_t *msg,
} }
static void
nxt_router_access_log_use(nxt_thread_spinlock_t *lock,
nxt_router_access_log_t *access_log)
{
if (access_log == NULL) {
return;
}
nxt_thread_spin_lock(lock);
access_log->count++;
nxt_thread_spin_unlock(lock);
}
static void static void
nxt_router_access_log_release(nxt_task_t *task, nxt_thread_spinlock_t *lock, nxt_router_access_log_release(nxt_task_t *task, nxt_thread_spinlock_t *lock,
nxt_router_access_log_t *access_log) nxt_router_access_log_t *access_log)