diff --git a/doc/guide.html b/doc/guide.html
index 02c5c94cd..86dfbe1d6 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -417,7 +417,7 @@ to install ejabberd.The files and directories created are, by de
/var/log/ejabberd/ Log directory (see section 7.1):
-
ejabberd.log
- ejabberd service log
-
- sasl.log
- Erlang/OTP system log
+
- erlang.log
- Erlang/OTP system log
@@ -3320,8 +3320,10 @@ Starts the Erlang system detached from the system console.
Tell Erlang runtime system to start the ejabberd application.
-mnesia dir "/var/lib/ejabberd/"
Specify the Mnesia database directory.
--sasl sasl_error_logger {file, "/var/log/ejabberd/sasl.log"}
+-sasl sasl_error_logger {file, "/var/log/ejabberd/erlang.log"}
Path to the Erlang/OTP system log file.
+SASL here means “System Architecture Support Libraries”
+not “Simple Authentication and Security Layer”.
+K [true|false]
Kernel polling.
-smp [auto|enable|disable]
@@ -3726,13 +3728,13 @@ domain.
When there is a risk of failure for a given component, domain balancing can cause service trouble. If one component is failing the service will not work correctly unless the sessions are rebalanced.
In this case, it is best to limit the problem to the sessions handled by the failing component. This is what the domain_balancing_component_number option does, making the load balancing algorithm not dynamic, but sticky on a fix number of component instances.
The syntax is:
-
- {domain_balancing_component_number, "component.example.com", N}.
+- {domain_balancing_component_number, "component.example.com", Number}.
An ejabberd node writes two log files:
-
ejabberd.log
- is the ejabberd service log, with the messages reported by ejabberd code
-
- sasl.log
- is the Erlang/OTP system log, with the messages reported by Erlang/OTP using SASL (System Architecture Support Libraries)
+
- erlang.log
- is the Erlang/OTP system log, with the messages reported by Erlang/OTP using SASL (System Architecture Support Libraries)
The option loglevel modifies the verbosity of the file ejabberd.log. The syntax is:
- {loglevel, Level}.
The possible Level are:
-
diff --git a/doc/guide.tex b/doc/guide.tex
index 74d6fa8b4..8732e4a05 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -415,7 +415,7 @@ The files and directories created are, by default:
\titem{/var/log/ejabberd/} Log directory (see section~\ref{logfiles}):
\begin{description}
\titem{ejabberd.log} ejabberd service log
- \titem{sasl.log} Erlang/OTP system log
+ \titem{erlang.log} Erlang/OTP system log
\end{description}
\end{description}
@@ -4252,8 +4252,10 @@ The command line parameters:
Tell Erlang runtime system to start the \ejabberd{} application.
\titem{-mnesia dir "/var/lib/ejabberd/"}
Specify the Mnesia database directory.
- \titem{-sasl sasl\_error\_logger \{file, "/var/log/ejabberd/sasl.log"\}}
+ \titem{-sasl sasl\_error\_logger \{file, "/var/log/ejabberd/erlang.log"\}}
Path to the Erlang/OTP system log file.
+ SASL here means ``System Architecture Support Libraries''
+ not ``Simple Authentication and Security Layer''.
\titem{+K [true|false]}
Kernel polling.
\titem{-smp [auto|enable|disable]}
@@ -4884,7 +4886,7 @@ The syntax is:
An \ejabberd{} node writes two log files:
\begin{description}
\titem{ejabberd.log} is the ejabberd service log, with the messages reported by \ejabberd{} code
- \titem{sasl.log} is the Erlang/OTP system log, with the messages reported by Erlang/OTP using SASL (System Architecture Support Libraries)
+ \titem{erlang.log} is the Erlang/OTP system log, with the messages reported by Erlang/OTP using SASL (System Architecture Support Libraries)
\end{description}
The option \term{loglevel} modifies the verbosity of the file ejabberd.log. The syntax is:
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
index 48a56ba5b..5ebfb5f6f 100644
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -102,7 +102,7 @@ if [ "$EJABBERD_MSGS_PATH" = "" ]; then
fi
EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
-SASL_LOG_PATH=$LOGS_DIR/sasl.log
+SASL_LOG_PATH=$LOGS_DIR/erlang.log
DATETIME=`date "+%Y%m%d-%H%M%S"`
ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
ERL_INETRC=$ETCDIR/inetrc
diff --git a/src/win32/ejabberd.nsi b/src/win32/ejabberd.nsi
index 8c828bda8..26fdb0618 100644
--- a/src/win32/ejabberd.nsi
+++ b/src/win32/ejabberd.nsi
@@ -180,7 +180,7 @@ SectionIn 1 RO
'-sname ejabberd -pa ebin \
-env EJABBERD_LOG_PATH log/ejabberd.log \
-s ejabberd -kernel inetrc \"./inetrc\" -mnesia dir \"spool\" \
- -sasl sasl_error_logger {file,\"log/sasl.log\"}' \
+ -sasl sasl_error_logger {file,\"log/erlang.log\"}' \
$INSTDIR\win32\ejabberd.ico
CreateShortCut "$0\Edit Config.lnk" "%SystemRoot%\system32\notepad.exe" \
"$INSTDIR\ejabberd.cfg"
@@ -215,7 +215,7 @@ SectionIn 1 RO
-args "-s ejabberd -pa ebin \
-kernel inetrc \\\"./inetrc\\\" \
-env EJABBERD_LOG_PATH log/ejabberd.log \
- -sasl sasl_error_logger {file,\\\"log/sasl.log\\\"} \
+ -sasl sasl_error_logger {file,\\\"log/erlang.log\\\"} \
-mnesia dir \\\"spool\\\"" -d'
Pop $0
diff --git a/tools/ejabberdctl b/tools/ejabberdctl
index 033640ecd..80d8702f7 100755
--- a/tools/ejabberdctl
+++ b/tools/ejabberdctl
@@ -8,7 +8,7 @@ ERL=erl
here=`which "$0" 2>/dev/null || echo .`
base="`dirname $here`/.."
ROOTDIR=`(cd "$base"; echo $PWD)`
-SASL_LOG_PATH=$ROOTDIR/sasl.log
+SASL_LOG_PATH=$ROOTDIR/erlang.log
EJABBERD_DB=$ROOTDIR/database/$NODE
EJABBERD_EBIN=$ROOTDIR/src
export EJABBERD_LOG_PATH=$ROOTDIR/ejabberd.log