Rename erlang log file sasl.log to erlang.log (EJAB-783)

SVN Revision: 2567

diff --git a/doc/guide.html b/doc/guide.html
index ef6d24757d2e489bbecf5eb187f1a6f094d93ce9..a4ec1acb4a777a021f5561248ae7e731b1f40767 100644 (file)
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -421,7 +421,7 @@ to install <TT>ejabberd</TT>.</P><P>The files and directories created are, by de
        </DD><DT CLASS="dt-description"><B><TT>/var/log/ejabberd/</TT></B></DT><DD CLASS="dd-description"> Log directory (see section&#XA0;<A HREF="#logfiles">7.1</A>):
                <DL CLASS="description"><DT CLASS="dt-description">
                        <B><TT>ejabberd.log</TT></B></DT><DD CLASS="dd-description"> ejabberd service log
-                       </DD><DT CLASS="dt-description"><B><TT>sasl.log</TT></B></DT><DD CLASS="dd-description"> Erlang/OTP system log
+                       </DD><DT CLASS="dt-description"><B><TT>erlang.log</TT></B></DT><DD CLASS="dd-description"> Erlang/OTP system log
                </DD></DL>
 </DD></DL><P> <A NAME="start"></A> </P><!--TOC subsection Start-->
 <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc13">2.4.5</A>&#XA0;&#XA0;<A HREF="#start">Start</A></H3><!--SEC END --><P> <A NAME="start"></A> 
@@ -3418,8 +3418,10 @@ Starts the Erlang system detached from the system console.
        Tell Erlang runtime system to start the <TT>ejabberd</TT> application.
 </DD><DT CLASS="dt-description"><B><TT>-mnesia dir "/var/lib/ejabberd/"</TT></B></DT><DD CLASS="dd-description">
        Specify the Mnesia database directory.
-</DD><DT CLASS="dt-description"><B><TT>-sasl sasl_error_logger {file, "/var/log/ejabberd/sasl.log"}</TT></B></DT><DD CLASS="dd-description">
+</DD><DT CLASS="dt-description"><B><TT>-sasl sasl_error_logger {file, "/var/log/ejabberd/erlang.log"}</TT></B></DT><DD CLASS="dd-description">
        Path to the Erlang/OTP system log file.
+SASL here means &#X201C;System Architecture Support Libraries&#X201D;
+not &#X201C;Simple Authentication and Security Layer&#X201D;.
 </DD><DT CLASS="dt-description"><B><TT>+K [true|false]</TT></B></DT><DD CLASS="dd-description">
        Kernel polling.
 </DD><DT CLASS="dt-description"><B><TT>-smp [auto|enable|disable]</TT></B></DT><DD CLASS="dd-description">
@@ -3830,7 +3832,7 @@ domain.</P><P> <A NAME="servicelb"></A> </P><!--TOC section Service Load-Balanci
 <H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc93">7.1</A>&#XA0;&#XA0;<A HREF="#logfiles">Log Files</A></H2><!--SEC END --><P> <A NAME="logfiles"></A> </P><P>An <TT>ejabberd</TT> node writes two log files:
 </P><DL CLASS="description"><DT CLASS="dt-description">
        <B><TT>ejabberd.log</TT></B></DT><DD CLASS="dd-description"> is the ejabberd service log, with the messages reported by <TT>ejabberd</TT> code
-       </DD><DT CLASS="dt-description"><B><TT>sasl.log</TT></B></DT><DD CLASS="dd-description"> is the Erlang/OTP system log, with the messages reported by Erlang/OTP using SASL (System Architecture Support Libraries)
+       </DD><DT CLASS="dt-description"><B><TT>erlang.log</TT></B></DT><DD CLASS="dd-description"> is the Erlang/OTP system log, with the messages reported by Erlang/OTP using SASL (System Architecture Support Libraries)
 </DD></DL><P>The option <TT>loglevel</TT> modifies the verbosity of the file ejabberd.log. The syntax is:
 </P><DL CLASS="description"><DT CLASS="dt-description"><B><TT>{loglevel, Level}.</TT></B></DT></DL><P>The possible <TT>Level</TT> are:
 </P><DL CLASS="description"><DT CLASS="dt-description">

diff --git a/doc/guide.tex b/doc/guide.tex
index 8d4f257a4cdc64999458f0ff44b01c2938002e30..b80b8be7d75e74215670ca64f8d7ad4b9aeb92eb 100644 (file)
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -419,7 +419,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}
 
@@ -4369,8 +4369,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]}
@@ -5001,7 +5003,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/doc/release_notes_2.1.0.txt b/doc/release_notes_2.1.0.txt
index 399f905e9576d8d3e6bafda766d51914d6e9a776..0c58f148b669676107f35d9fce1cf0fbc78e73e6 100644 (file)
--- a/doc/release_notes_2.1.0.txt
+++ b/doc/release_notes_2.1.0.txt
@@ -209,6 +209,8 @@
   There is a new syntax to define IP address and IP version.
   As usual, check the ejabberd Guide for more information.
 
+- The log file sasl.log is now called erlang.log
+
 - ejabberdctl commands now have _ characters instead of -.
   For backwards compatibility, it is still supported -.
 

diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
index 48a56ba5b19dc4dab8df55d256113fe7ab2d14b5..5ebfb5f6fe328109570bb4973158e5fbf31988e6 100644 (file)
--- 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 8c828bda8ae790d5881cf37d83b2cbf6ff6d1c63..26fdb06183d9bf9883c05c3ebec4b7f70a94aa4e 100644 (file)
--- 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 033640ecd4d6a4a9f0b3414cf1dd65b2dab6efb2..80d8702f7db7ac5122a8c8a77a8f32d17c09b2b3 100755 (executable)
--- 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