]> git.kaiwu.me - njs.git/commitdiff
Fixed js_periodic handler stopping after graceful shutdown.
authorDmitry Volyntsev <xeioex@nginx.com>
Thu, 31 Aug 2023 03:59:11 +0000 (20:59 -0700)
committerDmitry Volyntsev <xeioex@nginx.com>
Thu, 31 Aug 2023 03:59:11 +0000 (20:59 -0700)
The issue was introduced in f1bd0b1db065.

nginx/ngx_http_js_module.c
nginx/ngx_stream_js_module.c

index a1d54bdb37031dde2ba837367c03aabdc8c87708..7499ff84b2881d7e1b8f20d4802145ed5d5a3691 100644 (file)
@@ -4102,6 +4102,10 @@ ngx_http_js_periodic_handler(ngx_event_t *ev)
     ngx_http_request_t     *r;
     ngx_http_connection_t   hc;
 
+    if (ngx_terminate || ngx_exiting) {
+        return;
+    }
+
     periodic = ev->data;
 
     timer = periodic->interval;
index ab66de9df57a9b05c587eec65d714796157d0a81..8a0d6451172dfb950b3c0ab0c72f434de63aabb7 100644 (file)
@@ -1815,6 +1815,10 @@ ngx_stream_js_periodic_handler(ngx_event_t *ev)
     ngx_stream_session_t         *s;
     ngx_stream_core_main_conf_t  *cmcf;
 
+    if (ngx_terminate || ngx_exiting) {
+        return;
+    }
+
     periodic = ev->data;
 
     timer = periodic->interval;