diff options
| author | Badlop <badlop@process-one.net> | 2008-01-08 16:21:02 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2008-01-08 16:21:02 +0000 |
| commit | bceea5fc734dab1a377ad74aa187e01a0f7cb937 (patch) | |
| tree | a79e2d1d9b6875e37cfb865da1e797a2f3e04ec2 | |
| 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
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | doc/Makefile | 2 | ||||
| -rw-r--r-- | src/ejabberdctl.cfg.example | 14 | ||||
| -rw-r--r-- | src/ejabberdctl.template | 2 |
4 files changed, 12 insertions, 18 deletions
@@ -1,7 +1,17 @@ +2008-01-08 Badlop <badlop@process-one.net> + + * src/ejabberdctl.template: Removed the option ERL_FULLSWEEP_AFTER + because it is almost useless regarding ejabberd's performance. + * src/ejabberdctl.cfg.example: Likewise + +2008-01-08 Christophe Romain <christophe.romain@process-one.net> + + * doc/Makefile: fix version.tex generation bug + 2008-01-01 Badlop <badlop@process-one.net> * src/web/ejabberd_web_admin.erl: Uniformize the name of - ejabberd's web admin to: 'Web Admin' (EjAB-472) + ejabberd's web admin to: 'Web Admin' (EJAB-472) * doc/guide.tex: Likewise * doc/introduction.tex: Likewise diff --git a/doc/Makefile b/doc/Makefile index b579793c7..c5344ab5c 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -19,7 +19,7 @@ release: @echo "Press any key to continue" @read foo @echo "% ejabberd version (automatically generated)." > version.tex - @echo "\\\newcommand{\\\version}{"`cat ../src/ejabberd.hrl | grep VERSION | sed s/-define\(VERSION,\ \"//g | sed s/\"\).//g`"}" >> version.tex + @echo "\newcommand{\version}{"`sed '/VERSION/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../src/ejabberd.hrl`"}" >> version.tex @echo -n "% Contributed modules (automatically generated)." > contributed_modules.tex @echo "$(CONTRIBUTED_MODULES)" >> contributed_modules.tex 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 |