Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-24 17:29:28 +01:00
Code Releases Activity

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

Browse Source 
SVN Revision: 2567
This commit is contained in:
Badlop 2009-08-31 08:41:56 +00:00
parent 2568c616f7
commit 19dead97a3
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/guide.html
View File

@ -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>): </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"> <DL CLASS="description"><DT CLASS="dt-description">
<B><TT>ejabberd.log</TT></B></DT><DD CLASS="dd-description"> ejabberd service log <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>
</DD></DL><P> <A NAME="start"></A> </P><!--TOC subsection Start--> </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> <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. 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"> </DD><DT CLASS="dt-description"><B><TT>-mnesia dir "/var/lib/ejabberd/"</TT></B></DT><DD CLASS="dd-description">
Specify the Mnesia database directory. 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. 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"> </DD><DT CLASS="dt-description"><B><TT>+K [true|false]</TT></B></DT><DD CLASS="dd-description">
Kernel polling. Kernel polling.
</DD><DT CLASS="dt-description"><B><TT>-smp [auto|enable|disable]</TT></B></DT><DD CLASS="dd-description"> </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: <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"> </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 <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: </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"><B><TT>{loglevel, Level}.</TT></B></DT></DL><P>The possible <TT>Level</TT> are:
</P><DL CLASS="description"><DT CLASS="dt-description"> </P><DL CLASS="description"><DT CLASS="dt-description">

8
doc/guide.tex
View File

@ -419,7 +419,7 @@ The files and directories created are, by default:
\titem{/var/log/ejabberd/} Log directory (see section~\ref{logfiles}): \titem{/var/log/ejabberd/} Log directory (see section~\ref{logfiles}):
\begin{description} \begin{description}
\titem{ejabberd.log} ejabberd service log \titem{ejabberd.log} ejabberd service log
\titem{sasl.log} Erlang/OTP system log \titem{erlang.log} Erlang/OTP system log
\end{description} \end{description}
\end{description} \end{description}
@ -4369,8 +4369,10 @@ The command line parameters:
Tell Erlang runtime system to start the \ejabberd{} application. Tell Erlang runtime system to start the \ejabberd{} application.
\titem{-mnesia dir "/var/lib/ejabberd/"} \titem{-mnesia dir "/var/lib/ejabberd/"}
Specify the Mnesia database directory. 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. 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]} \titem{+K [true|false]}
Kernel polling. Kernel polling.
\titem{-smp [auto|enable|disable]} \titem{-smp [auto|enable|disable]}
@ -5001,7 +5003,7 @@ The syntax is:
An \ejabberd{} node writes two log files: An \ejabberd{} node writes two log files:
\begin{description} \begin{description}
\titem{ejabberd.log} is the ejabberd service log, with the messages reported by \ejabberd{} code \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} \end{description}
The option \term{loglevel} modifies the verbosity of the file ejabberd.log. The syntax is: The option \term{loglevel} modifies the verbosity of the file ejabberd.log. The syntax is:

2
doc/release_notes_2.1.0.txt
View File

@ -209,6 +209,8 @@
There is a new syntax to define IP address and IP version. There is a new syntax to define IP address and IP version.
As usual, check the ejabberd Guide for more information. 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 -. - ejabberdctl commands now have _ characters instead of -.
For backwards compatibility, it is still supported -. For backwards compatibility, it is still supported -.

2
src/ejabberdctl.template
View File

@ -102,7 +102,7 @@ if [ "$EJABBERD_MSGS_PATH" = "" ]; then
fi fi
EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log 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"` DATETIME=`date "+%Y%m%d-%H%M%S"`
ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
ERL_INETRC=$ETCDIR/inetrc ERL_INETRC=$ETCDIR/inetrc

4
src/win32/ejabberd.nsi
View File

@ -180,7 +180,7 @@ SectionIn 1 RO
'-sname ejabberd -pa ebin \ '-sname ejabberd -pa ebin \
-env EJABBERD_LOG_PATH log/ejabberd.log \ -env EJABBERD_LOG_PATH log/ejabberd.log \
-s ejabberd -kernel inetrc \"./inetrc\" -mnesia dir \"spool\" \ -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 $INSTDIR\win32\ejabberd.ico
CreateShortCut "$0\Edit Config.lnk" "%SystemRoot%\system32\notepad.exe" \ CreateShortCut "$0\Edit Config.lnk" "%SystemRoot%\system32\notepad.exe" \
"$INSTDIR\ejabberd.cfg" "$INSTDIR\ejabberd.cfg"
@ -215,7 +215,7 @@ SectionIn 1 RO
-args "-s ejabberd -pa ebin \ -args "-s ejabberd -pa ebin \
-kernel inetrc \\\"./inetrc\\\" \ -kernel inetrc \\\"./inetrc\\\" \
-env EJABBERD_LOG_PATH log/ejabberd.log \ -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' -mnesia dir \\\"spool\\\"" -d'
Pop $0 Pop $0

2
tools/ejabberdctl
View File

@ -8,7 +8,7 @@ ERL=erl
here=`which "$0" 2>/dev/null || echo .` here=`which "$0" 2>/dev/null || echo .`
base="`dirname $here`/.." base="`dirname $here`/.."
ROOTDIR=`(cd "$base"; echo $PWD)` ROOTDIR=`(cd "$base"; echo $PWD)`
SASL_LOG_PATH=$ROOTDIR/sasl.log SASL_LOG_PATH=$ROOTDIR/erlang.log
EJABBERD_DB=$ROOTDIR/database/$NODE EJABBERD_DB=$ROOTDIR/database/$NODE
EJABBERD_EBIN=$ROOTDIR/src EJABBERD_EBIN=$ROOTDIR/src
export EJABBERD_LOG_PATH=$ROOTDIR/ejabberd.log export EJABBERD_LOG_PATH=$ROOTDIR/ejabberd.log