[patch] squid.initd epoll fix

squid_fd_epoll.patch (text/plain), 786 bytes, created by Denis Kaganovich on 2009-08-07 16:45:03 UTC

--- squid.initd.orig
+++ squid.initd
@@ -9,16 +9,20 @@ depend() {
 	need net
 }
 
+upval() {
+	[ -f $1 ] || return 0
+	if [ `cat $1` -lt $2 ]; then
+		echo $2 > $1
+	fi
+}
+
 # Try to increase the # of filedescriptors we can open.
 maxfds() {
 	[ -n "$SQUID_MAXFD" ] || return
-	[ -f /proc/sys/fs/file-max ] || return 0
 	[ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192
-	local global_file_max=`cat /proc/sys/fs/file-max`
 	local minimal_file_max=$(($SQUID_MAXFD + 4096))
-	if [ "$global_file_max" -lt $minimal_file_max ]; then
-		echo $minimal_file_max > /proc/sys/fs/file-max
-	fi
+	upval /proc/sys/fs/file-max $minimal_file_max || return 0
+	( /usr/sbin/squid -v|grep -q "\--disable-epoll" ) || upval /proc/sys/fs/epoll/max_user_watches $minimal_file_max
 	ulimit -n $SQUID_MAXFD
 }