186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

applied slab_alloc_no_memory_as_info.patch to lower the log level of the error message "ngx_slab_alloc() failed: no memory" from "crit" to "info".

Browse Source
This commit is contained in:
agentzh (Yichun Zhang)
2012-12-05 20:54:05 -08:00
parent 31e4baf6ca
commit 1f83898d01
5 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
patches/nginx-1.2.4-slab_alloc_no_memory_as_info.patch Normal file
View File

@ -0,0 +1,11 @@
--- nginx-1.2.4/src/core/ngx_slab.c 2012-09-24 11:34:04.000000000 -0700
+++ nginx-1.2.4-patched/src/core/ngx_slab.c 2012-12-05 20:47:07.296694952 -0800
@@ -657,7 +657,7 @@ ngx_slab_alloc_pages(ngx_slab_pool_t *po
}
}
- ngx_slab_error(pool, NGX_LOG_CRIT, "ngx_slab_alloc() failed: no memory");
+ ngx_slab_error(pool, NGX_LOG_INFO, "ngx_slab_alloc() failed: no memory");
return NULL;
}

11
patches/nginx-1.2.5-slab_alloc_no_memory_as_info.patch Normal file
View File

@ -0,0 +1,11 @@
--- nginx-1.2.5/src/core/ngx_slab.c 2012-09-24 11:34:04.000000000 -0700
+++ nginx-1.2.5-patched/src/core/ngx_slab.c 2012-12-05 20:47:07.296694952 -0800
@@ -657,7 +657,7 @@ ngx_slab_alloc_pages(ngx_slab_pool_t *po
}
}
- ngx_slab_error(pool, NGX_LOG_CRIT, "ngx_slab_alloc() failed: no memory");
+ ngx_slab_error(pool, NGX_LOG_INFO, "ngx_slab_alloc() failed: no memory");
return NULL;
}

11
patches/nginx-1.3.7-slab_alloc_no_memory_as_info.patch Normal file
View File

@ -0,0 +1,11 @@
--- nginx-1.3.7/src/core/ngx_slab.c 2012-09-24 11:34:04.000000000 -0700
+++ nginx-1.3.7-patched/src/core/ngx_slab.c 2012-12-05 20:47:07.296694952 -0800
@@ -657,7 +657,7 @@ ngx_slab_alloc_pages(ngx_slab_pool_t *po
}
}
- ngx_slab_error(pool, NGX_LOG_CRIT, "ngx_slab_alloc() failed: no memory");
+ ngx_slab_error(pool, NGX_LOG_INFO, "ngx_slab_alloc() failed: no memory");
return NULL;
}

4
util/mirror-tarballs
View File

@ -125,6 +125,10 @@ echo "$info_txt applying the upstream_test_connect_kqueue patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-upstream_test_connect_kqueue.patch || exit 1
echo
echo "$info_txt applying the slab_alloc_no_memory_as_info patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-slab_alloc_no_memory_as_info.patch || exit 1
echo
rm -f *.patch || exit 1
cd .. || exit 1

2
util/ver
View File

@ -3,7 +3,7 @@
#main_ver=1.3.7
#main_ver=1.2.5
main_ver=1.2.4
minor_ver=11rc3
minor_ver=11rc4
version=$main_ver.$minor_ver
echo $version