aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2008-01-08 16:21:02 +0000
committerBadlop <badlop@process-one.net>2008-01-08 16:21:02 +0000
commitbceea5fc734dab1a377ad74aa187e01a0f7cb937 (patch)
treea79e2d1d9b6875e37cfb865da1e797a2f3e04ec2 /src
parent* src/web/ejabberd_web_admin.erl: Uniformize the name of (diff)
Merged changesets 1139 and 1140 from trunk:
* doc/Makefile: fix version.tex generation bug * src/ejabberdctl.template: Removed the option ERL_FULLSWEEP_AFTER because it is almost useless regarding ejabberd's performance. * src/ejabberdctl.cfg.example: Likewise SVN Revision: 1141
Diffstat (limited to 'src')
-rw-r--r--src/ejabberdctl.cfg.example14
-rw-r--r--src/ejabberdctl.template2
2 files changed, 0 insertions, 16 deletions
diff --git a/src/ejabberdctl.cfg.example b/src/ejabberdctl.cfg.example
index eb763e61d..91f50346d 100644
--- a/src/ejabberdctl.cfg.example
+++ b/src/ejabberdctl.cfg.example
@@ -61,20 +61,6 @@
#
#ERL_MAX_ETS_TABLES=1400
-# ERL_FULLSWEEP_AFTER: Maximum number of collections before a forced fullsweep
-#
-# To reduce memory usage, you can set environment variable ERL_FULLSWEEP_AFTER.
-# But in this case ejabberd may work slower.
-#
-# The ERL_FULLSWEEP_AFTER option shrinks the size of the Erlang process after
-# RAM intensive events. Note that this option may downgrade performance. Hence
-# this option is only interesting on machines that also host other services
-# (webserver, mail) on which ejabberd does not receive constant load.
-#
-# Default: 65535
-#
-#ERL_FULLSWEEP_AFTER=65536
-
# The next variable allows to explicitly specify erlang node for ejabberd
# It can be given in different formats:
# ERLANG_NODE=ejabberd
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
index 09128a823..dd617a523 100644
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -6,7 +6,6 @@ SMP=auto
ERL_MAX_PORTS=32000
ERL_PROCESSES=250000
ERL_MAX_ETS_TABLES=1400
-ERL_FULLSWEEP_AFTER=65536
# define default environment variables
NODE=ejabberd
@@ -62,7 +61,6 @@ export ERL_MAX_ETS_TABLES
export ERL_CRASH_DUMP
export EJABBERD_LOG_PATH
export HOME
-[ $ERL_FULLSWEEP_AFTER = "disabled" ] || export ERL_FULLSWEEP_AFTER
[ -d $EJABBERD_DB ] || mkdir -p $EJABBERD_DB
[ -d $LOGS_DIR ] || mkdir -p $LOGS_DIR