cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[svn] By default, leave MAX_BUFFER fds free for log files, 

server connections, ident lookups, exceed_limit clients,
etc. Mention this in example.conf and reference.conf.
This commit is contained in:
jilles 2007-04-04 17:12:55 -07:00
parent 78e647ad3f
commit 23836ead45
5 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
jilles 2007/04/03 22:45:04 UTC (20070403-3384)
Log:
--with-maxclients configure option is gone
Changes: Modified:
+0 -11 trunk/INSTALL (File Modified)
jilles 2007/04/03 22:25:11 UTC (20070403-3380) jilles 2007/04/03 22:25:11 UTC (20070403-3380)
Log: Log:
Make the code that raises fd rlimit to hard limit work. Make the code that raises fd rlimit to hard limit work.

8
doc/example.conf
View File

@ -4,7 +4,7 @@
* Copyright (C) 2002-2005 ircd-ratbox development team * Copyright (C) 2002-2005 ircd-ratbox development team
* Copyright (C) 2005-2006 charybdis development team * Copyright (C) 2005-2006 charybdis development team
* *
* $Id: example.conf 3257 2007-03-13 16:09:28Z jilles $ * $Id: example.conf 3390 2007-04-05 00:12:55Z jilles $
* *
* See reference.conf for more information. * See reference.conf for more information.
*/ */
@ -43,8 +43,10 @@ serverinfo {
/* for IPv6 */ /* for IPv6 */
#vhost6 = "3ffe:80e8:546::2"; #vhost6 = "3ffe:80e8:546::2";
/* max_clients: This should be set to the amount of connections /* max_clients: This should be set to the maximum amount of clients
* the server can handle. * that the server should support. Note that you should leave some
* file descriptors free for log files, server connections, ident
* lookups (if enabled), exceed_limit clients, etc.
*/ */
max_clients = 1024; max_clients = 1024;
}; };

6
doc/reference.conf
View File

@ -6,7 +6,7 @@
* *
* Written by ejb, wcampbel, db, leeh and others * Written by ejb, wcampbel, db, leeh and others
* *
* $Id: reference.conf 3257 2007-03-13 16:09:28Z jilles $ * $Id: reference.conf 3390 2007-04-05 00:12:55Z jilles $
*/ */
/* IMPORTANT NOTES: /* IMPORTANT NOTES:
@ -120,7 +120,9 @@ serverinfo {
#vhost6 = "3ffe:80e8:546::2"; #vhost6 = "3ffe:80e8:546::2";
/* max_clients: this should be set to the maximum amount of clients /* max_clients: this should be set to the maximum amount of clients
* that the server should support. * that the server should support. Note that you should leave some
* file descriptors free for log files, server connections, ident
* lookups (if enabled), exceed_limit clients, etc.
*/ */
max_clients = 1024; max_clients = 1024;
}; };

2
include/serno.h
View File

@ -1 +1 @@
#define SERNO "20070403-3380" #define SERNO "20070403-3384"

4
src/s_conf.c
View File

@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA * USA
* *
* $Id: s_conf.c 3368 2007-04-03 10:11:06Z nenolod $ * $Id: s_conf.c 3390 2007-04-05 00:12:55Z jilles $
*/ */
#include "stdinc.h" #include "stdinc.h"
@ -851,7 +851,7 @@ set_default_conf(void)
ConfigFileEntry.reject_ban_time = 300; ConfigFileEntry.reject_ban_time = 300;
ConfigFileEntry.reject_duration = 120; ConfigFileEntry.reject_duration = 120;
ServerInfo.max_clients = comm_get_maxconnections(); ServerInfo.max_clients = comm_get_maxconnections() - MAX_BUFFER;
} }
#undef YES #undef YES