feature: make use of the new shm API in nginx 1.5.13+ to suppress the "no memory" error logging when the shared dicts run out of memory.

Author: agentzh

src/ngx_http_lua_shdict.c

@@ -91,6 +91,10 @@ ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data)
     ngx_sprintf(ctx->shpool->log_ctx, " in lua_shared_dict zone \"%V\"%Z",
                 &shm_zone->shm.name);
 
+#if defined(nginx_version) && nginx_version >= 1005013
+    ctx->shpool->log_nomem = 0;
+#endif
+
 done:
     dd("get lmcf");
 

t/043-shdict.t

@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 #repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 15);
+plan tests => repeat_each() * (blocks() * 3 + 17);
 
 #no_diff();
 no_long_string();
@@ -401,10 +401,10 @@ GET /test
 --- response_body
 false no memory false
 --- log_level: info
---- error_log eval
-qr/\[info\] .* ngx_slab_alloc\(\) failed: no memory in lua_shared_dict zone "dogs"/
 --- no_error_log
 [error]
+[crit]
+ngx_slab_alloc() failed: no memory in lua_shared_dict zone
 
 
 
@@ -706,10 +706,10 @@ GET /test
 --- response_body
 false no memory true
 --- log_level: info
---- error_log eval
-qr/\[info\] .* ngx_slab_alloc\(\) failed: no memory in lua_shared_dict zone "dogs"/
 --- no_error_log
 [error]
+[crit]
+ngx_slab_alloc() failed: no memory in lua_shared_dict zone