/[smeserver]/rpms/e-smith-proxy/sme9/e-smith-proxy-5.6.0-set_file_desc_limit.patch
ViewVC logotype

Contents of /rpms/e-smith-proxy/sme9/e-smith-proxy-5.6.0-set_file_desc_limit.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Thu Jan 5 16:41:41 2017 UTC (7 years, 10 months ago) by vip-ire
Branch: MAIN
CVS Tags: e-smith-proxy-5_4_0-5_el6_sme, HEAD
Error occurred while calculating annotation data.
* Thu Jan 5 2017 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-5.sme
- Allow custom file descriptor limit, and set default to 4096 [SME: 9911]

1 diff -Nur e-smith-proxy-5.6.0/root/etc/e-smith/templates/etc/squid/squid.conf/96filedescriptor e-smith-proxy-5.6.0_bz9912/root/etc/e-smith/templates/etc/squid/squid.conf/96filedescriptor
2 --- e-smith-proxy-5.6.0/root/etc/e-smith/templates/etc/squid/squid.conf/96filedescriptor 1970-01-01 01:00:00.000000000 +0100
3 +++ e-smith-proxy-5.6.0_bz9912/root/etc/e-smith/templates/etc/squid/squid.conf/96filedescriptor 2017-01-05 15:30:02.847287303 +0100
4 @@ -0,0 +1 @@
5 +max_filedesc { ($squid{'MaxFileDesc'} || '4096') }
6 diff -Nur e-smith-proxy-5.6.0/root/var/service/squid/run e-smith-proxy-5.6.0_bz9912/root/var/service/squid/run
7 --- e-smith-proxy-5.6.0/root/var/service/squid/run 2016-02-05 22:48:22.000000000 +0100
8 +++ e-smith-proxy-5.6.0_bz9912/root/var/service/squid/run 2017-01-05 15:38:10.792208789 +0100
9 @@ -6,6 +6,7 @@
10 exec 2>&1
11 squid=/usr/sbin/squid
12 config=/etc/squid/squid.conf
13 +file_descr=$(/sbin/e-smith/db configuration getprop squid MaxFileDesc || echo 4096)
14
15 [ -e $squid ] || exit 1
16 [ -e $config ] || exit 1
17 @@ -16,5 +17,6 @@
18 $squid -z -f $config
19 fi
20
21 +ulimit -Hn $file_descr
22 exec /usr/local/bin/setuidgid squid \
23 $squid -f $config -sN

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed