fix: fix typo

Author: rainingmaster

README.markdown

@@ -1585,9 +1585,9 @@ exit_worker_by_lua_block
 
 **phase:** *exiting-worker*
 
-Runs the specified Lua code upon every Nginx worker process's exiting when the master process is enabled.
+Runs the specified Lua code upon every Nginx worker process's exit when the master process is enabled. When the master process is disabled, this hook will before run Nginx process exiting.
 
-This hook is often used to release resources when [init_worker_by_lua*](#init_worker_by_lua_block) create resources, To prevent the worker exit abnormal.
+This hook is ogten used to release resources allocated by each worker (e.g. resources allocated by [init_worker_by_lua*](#init_worker_by_lua)), or to prevent workers from exiting abnormally.
 
 For example,
 
@@ -1603,7 +1603,7 @@ For example,
 exit_worker_by_lua_file
 -----------------------
 
-**syntax:** *exit_worker_by_lua_file { lua--file-path }*
+**syntax:** *exit_worker_by_lua_file { lua-file-path }*
 
 **context:** *http*
 
@@ -7832,6 +7832,8 @@ Retrieves the current running phase name. Possible return values are
 	for the context of [log_by_lua*](#log_by_lua).
 * `timer`
 	for the context of user callback functions for [ngx.timer.*](#ngxtimerat).
+* `exit_worker`
+	for the context of [exit_worker_by_lua*](#exit_worker_by_lua).
 
 This API was first introduced in the `v0.5.10` release.
 

doc/HttpLuaModule.wiki

@@ -1285,9 +1285,9 @@ This hook no longer runs in the cache manager and cache loader processes since t
 
 '''phase:''' ''exiting-worker''
 
-Runs the specified Lua code upon every Nginx worker process's exiting when the master process is enabled. When the master process is disabled, this hook will before run Nginx process exiting.
+Runs the specified Lua code upon every Nginx worker process's exit when the master process is enabled. When the master process is disabled, this hook will before run Nginx process exiting.
 
-This hook is often used to release resources when [[#init_worker_by_lua|init_worker_by_lua*]] create resources, to prevent the worker from exiting abnormally.
+This hook is ogten used to release resources allocated by each worker (e.g. resources allocated by [[#init_worker_by_lua|init_worker_by_lua*]]), or to prevent workers from exiting abnormally.
 
 For example,
 
@@ -1299,7 +1299,7 @@ For example,
 
 == exit_worker_by_lua_file ==
 
-'''syntax:''' ''exit_worker_by_lua_file { lua--file-path }''
+'''syntax:''' ''exit_worker_by_lua_file { lua-file-path }''
 
 '''context:''' ''http''
 
@@ -6660,6 +6660,8 @@ Retrieves the current running phase name. Possible return values are
 : for the context of [[#log_by_lua|log_by_lua*]].
 * <code>timer</code>
 : for the context of user callback functions for [[#ngx.timer.at|ngx.timer.*]].
+* <code>exit_worker</code>
+: for the context of [[#exit_worker_by_lua|exit_worker_by_lua*]].
 
 This API was first introduced in the <code>v0.5.10</code> release.
 

src/ngx_http_lua_exitworkerby.c

@@ -26,7 +26,15 @@ ngx_http_lua_exit_worker(ngx_cycle_t *cycle)
     lmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_lua_module);
     if (lmcf == NULL
         || lmcf->exit_worker_handler == NULL
-        || lmcf->lua == NULL)
+        || lmcf->lua == NULL
+#if !(NGX_WIN32)
+        || (ngx_process == NGX_PROCESS_HELPER
+#   ifdef HAVE_PRIVILEGED_PROCESS_PATCH
+            && !ngx_is_privileged_agent
+#   endif
+           )
+#endif  /* NGX_WIN32 */
+       )
     {
         return;
     }
@@ -89,13 +97,13 @@ ngx_http_lua_exit_worker_by_inline(ngx_log_t *log,
 
 
 ngx_int_t
-ngx_http_lua_exit_worker_by_file(ngx_log_t *log,
-    ngx_http_lua_main_conf_t *lmcf, lua_State *L)
+ngx_http_lua_exit_worker_by_file(ngx_log_t *log, ngx_http_lua_main_conf_t *lmcf,
+    lua_State *L)
 {
     int         status;
 
     status = luaL_loadfile(L, (char *) lmcf->exit_worker_src.data)
              || ngx_http_lua_do_call(log, L);
 
-    return ngx_http_lua_report(log, L, status, "exit_worker_by_file");
+    return ngx_http_lua_report(log, L, status, "exit_worker_by_lua_file");
 }

t/089-phase.t

@@ -8,7 +8,7 @@ log_level('warn');
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2) + 3;
+plan tests => repeat_each() * (blocks() * 2 + 2);
 
 #no_diff();
 #no_long_string();
@@ -184,6 +184,7 @@ init_worker
     exit_worker_by_lua_block {
         local phase = ngx.get_phase()
         ngx.log(ngx.ERR, phase)
+        ngx.log(ngx.ERR, "exiting now")
     }
 --- config
     location /lua {
@@ -195,5 +196,8 @@ init_worker
 GET /lua
 --- response_body
 ok
---- shutdown_error_log
-exit_worker_by_lua:3: exit_worker
+--- shutdown_error_log eval
+[
+qr/exit_worker_by_lua:\d+: exit_worker/,
+qr/exiting now$/,
+]

t/162-exit-worker.t

@@ -2,9 +2,10 @@
 
 use Test::Nginx::Socket::Lua;
 
+master_on();
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 2);
+plan tests => repeat_each() * (blocks() * 2 + 7);
 
 #log_level("warn");
 no_long_string();
@@ -87,7 +88,7 @@ hello, world
 
         local ok, err = ngx.timer.at(0, bar)
         if not ok then
-            ngx.log(ngx.ERR, "failed to create timer: " .. err)
+            ngx.log(ngx.ERR, "failed to create timer: ", err)
         else
             ngx.log(ngx.NOTICE, "success")
         end
@@ -101,19 +102,20 @@ GET /t
 --- response_body
 ok
 --- no_error_log
+[error]
 
 
 
 === TEST 5: exit_worker_by_lua use shdict
 --- http_config
-    lua_shared_dict dog 10m;
+    lua_shared_dict dog 1m;
     exit_worker_by_lua_block {
         local dog = ngx.shared.dog
         local val, err = dog:get("foo")
         if not val then
-            ngx.log(ngx.ERR, "failed get shdict: " .. err)
+            ngx.log(ngx.ERR, "failed get shdict: ", err)
         else
-            ngx.log(ngx.NOTICE, "get val: " .. val)
+            ngx.log(ngx.NOTICE, "get val: ", val)
         end
     }
 --- config
@@ -130,3 +132,60 @@ GET /t
 ok
 --- shutdown_error_log
 get val: 100
+
+
+
+=== TEST 6: skip in cache processes (with exit worker and privileged agent)
+--- http_config
+    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
+
+    proxy_cache_path /tmp/cache levels=1:2 keys_zone=cache:1m;
+
+    init_by_lua_block {
+        assert(require "ngx.process".enable_privileged_agent())
+    }
+
+    exit_worker_by_lua_block {
+        ngx.log(ngx.NOTICE, "hello from exit worker by lua")
+    }
+--- config
+    location = /t {
+        return 200;
+    }
+--- request
+    GET /t
+--- no_error_log
+[error]
+--- shutdown_error_log eval
+[
+qr/cache loader process \d+ exited/,
+qr/cache manager process \d+ exited/,
+qr/hello from exit worker by lua$/,
+qr/hello from exit worker by lua$/,
+qr/privileged agent process \d+ exited/,
+]
+
+
+
+=== TEST 7: skipin cache processes (with init worker but without privileged agent)
+--- http_config
+    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
+
+    proxy_cache_path /tmp/cache levels=1:2 keys_zone=cache:1m;
+
+    exit_worker_by_lua_block {
+        ngx.log(ngx.WARN, "hello from exit worker by lua")
+    }
+--- config
+    location = /t {
+        return 200;
+    }
+--- request
+    GET /t
+--- no_error_log
+[error]
+start privileged agent process
+--- shutdown_error_log eval
+[
+qr/hello from exit worker by lua$/,
+]