[nginx] Core: hash now ignores bucket_size if it hits max_size l...

Maxim Dounin mdounin at mdounin.ru
Tue Apr 1 13:50:10 UTC 2014


details:   http://hg.nginx.org/nginx/rev/c348dea081fb
branches:  
changeset: 5635:c348dea081fb
user:      Maxim Dounin <mdounin at mdounin.ru>
date:      Mon Mar 31 21:40:31 2014 +0400
description:
Core: hash now ignores bucket_size if it hits max_size limit.

diffstat:

 src/core/ngx_hash.c |  13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diffs (24 lines):

diff --git a/src/core/ngx_hash.c b/src/core/ngx_hash.c
--- a/src/core/ngx_hash.c
+++ b/src/core/ngx_hash.c
@@ -312,15 +312,12 @@ ngx_hash_init(ngx_hash_init_t *hinit, ng
         continue;
     }
 
-    ngx_log_error(NGX_LOG_EMERG, hinit->pool->log, 0,
-                  "could not build the %s, you should increase "
-                  "either %s_max_size: %i or %s_bucket_size: %i",
+    ngx_log_error(NGX_LOG_WARN, hinit->pool->log, 0,
+                  "could not build optimal %s, you should increase "
+                  "either %s_max_size: %i or %s_bucket_size: %i; "
+                  "ignoring %s_bucket_size",
                   hinit->name, hinit->name, hinit->max_size,
-                  hinit->name, hinit->bucket_size);
-
-    ngx_free(test);
-
-    return NGX_ERROR;
+                  hinit->name, hinit->bucket_size, hinit->name);
 
 found:
 



More information about the nginx-devel mailing list