mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 04:13:28 +01:00
merge from 0.2.0.x: r15718: Warn the admin if the number of file descriptors on his system is tiny
svn:r15719
This commit is contained in:
parent
272165e659
commit
57de86bae7
4
debian/changelog
vendored
4
debian/changelog
vendored
@ -1,8 +1,10 @@
|
||||
tor (0.2.1.0-unreleased-1) XXperimental; urgency=low
|
||||
|
||||
* trunk
|
||||
* Warn the admin if the number of file descriptors on his system is
|
||||
tiny.
|
||||
|
||||
-- Peter Palfrader <weasel@debian.org> Wed, 19 Mar 2008 20:09:25 +0100
|
||||
-- Peter Palfrader <weasel@debian.org> Mon, 07 Jul 2008 13:25:49 +0200
|
||||
|
||||
tor (0.2.0.28-rc-1) experimental; urgency=low
|
||||
|
||||
|
24
debian/tor.init
vendored
24
debian/tor.init
vendored
@ -28,14 +28,26 @@ ARGS=""
|
||||
# Let's try to figure our some sane defaults:
|
||||
if [ -r /proc/sys/fs/file-max ]; then
|
||||
system_max=`cat /proc/sys/fs/file-max`
|
||||
if [ "$system_max" -gt "80000" ] ; then
|
||||
MAX_FILEDESCRIPTORS=32768
|
||||
elif [ "$system_max" -gt "40000" ] ; then
|
||||
MAX_FILEDESCRIPTORS=16384
|
||||
elif [ "$system_max" -gt "10000" ] ; then
|
||||
MAX_FILEDESCRIPTORS=8192
|
||||
#if [ "$system_max" -gt "80000" ] ; then
|
||||
#MAX_FILEDESCRIPTORS=32768
|
||||
#elif [ "$system_max" -gt "40000" ] ; then
|
||||
#MAX_FILEDESCRIPTORS=16384
|
||||
#elif [ "$system_max" -gt "10000" ] ; then
|
||||
#MAX_FILEDESCRIPTORS=8192
|
||||
if 0; then
|
||||
echo fo
|
||||
else
|
||||
MAX_FILEDESCRIPTORS=1024
|
||||
cat << EOF
|
||||
|
||||
Warning: Your system has very few filedescriptors available in total.
|
||||
|
||||
Maybe you should try raising that by adding 'fs.file-max=100000' to your
|
||||
/etc/sysctl.conf file. Feel free to pick any number that you deem appropriate.
|
||||
Then run 'sysctl -p'. See /proc/sys/fs/file-max for the current value, and
|
||||
file-nr in the same directory for how many of those are used at the moment.
|
||||
|
||||
EOF
|
||||
fi
|
||||
else
|
||||
MAX_FILEDESCRIPTORS=8192
|
||||
|
Loading…
Reference in New Issue
Block a user