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".
This commit is contained in:
parent
31e4baf6ca
commit
1f83898d01
|
@ -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;
|
||||||
|
}
|
|
@ -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;
|
||||||
|
}
|
|
@ -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;
|
||||||
|
}
|
|
@ -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
|
patch -p1 < $root/patches/nginx-$main_ver-upstream_test_connect_kqueue.patch || exit 1
|
||||||
echo
|
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
|
rm -f *.patch || exit 1
|
||||||
|
|
||||||
cd .. || exit 1
|
cd .. || exit 1
|
||||||
|
|
Loading…
Reference in New Issue