[sr-dev] git:master: xlog(k): fixed wrong xml tag

Module: sip-router Branch: master Commit: 4bfa0bbc93d89ba0df83d866c97e58cab6fc0716 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4bfa0bb… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Thu Mar 29 18:23:52 2012 +0200 xlog(k): fixed wrong xml tag - readme was regenerated --- modules_k/xlog/README | 36 ++++++++++++++++++++++-------------- modules_k/xlog/doc/xlog_admin.xml | 1 - 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/modules_k/xlog/README b/modules_k/xlog/README index f3400eb..efb41fb 100644 --- a/modules_k/xlog/README +++ b/modules_k/xlog/README @@ -11,9 +11,9 @@ Elena-Ramona Modroiu &lt;ramona(a)rosdev.ro&gt; - Copyright © 2003 FhG FOKUS + Copyright � 2003 FhG FOKUS - Copyright © 2008-2010 Elena-Ramona Modroiu + Copyright � 2008-2010 Elena-Ramona Modroiu __________________________________________________________________ Table of Contents @@ -37,9 +37,9 @@ Elena-Ramona Modroiu 5. Functions - 5.1. xlog([level,] format) + 5.1. xlog([[facility,] level,] format) 5.2. xdbg(format) - 5.3. xlogl([level],format) + 5.3. xlogl([[facility,] level,] format) 5.4. xdbgl(format) List of Examples @@ -73,9 +73,9 @@ Chapter 1. Admin Guide 5. Functions - 5.1. xlog([level,] format) + 5.1. xlog([[facility,] level,] format) 5.2. xdbg(format) - 5.3. xlogl([level],format) + 5.3. xlogl([[facility,] level,] format) 5.4. xdbgl(format) 1. Overview @@ -83,7 +83,7 @@ Chapter 1. Admin Guide This module provides the possibility to print user formatted log or debug messages from Kamailio scripts, similar to the printf function. A C-style printf specifier is replaced with a part of the SIP request or - other variables from system. Section 2, “Implemented Specifiers” shows + other variables from system. Section 2, "Implemented Specifiers" shows what can be printed out. 2. Implemented Specifiers @@ -186,16 +186,21 @@ modparam("xlog", "log_facility", "LOG_DAEMON") 5. Functions - 5.1. xlog([level,] format) + 5.1. xlog([[facility,] level,] format) 5.2. xdbg(format) - 5.3. xlogl([level],format) + 5.3. xlogl([[facility,] level,] format) 5.4. xdbgl(format) -5.1. xlog([level,] format) +5.1. xlog([[facility,] level,] format) Print a formated message using LOG function. Meaning of the parameters are as follows: + * facility - The log facility that will be used for this single log + message. + If this parameter is missing, the implicit facility is either the + facility set with the 'log_facility' module parameter or the core's + log facility. * level - The level that will be used in LOG function. It can be: + L_ALERT - log level -5 + L_BUG - log level -4 @@ -209,7 +214,7 @@ modparam("xlog", "log_facility", "LOG_DAEMON") See above options for valid log levels. If it is not a pseudo-variable, then what really matters is the third letter of the value. If the log level is higher than the - “debug” global parameter, the message is not printed to syslog. + "debug" global parameter, the message is not printed to syslog. If this parameter is missing, the implicit log level is 'L_ERR'. * format - The formatted string to be printed. @@ -224,8 +229,11 @@ xlog("time [$Tf] method ($rm) r-uri ($ru) 2nd via ($hdr(via[1]))\n"); $var(loglevel) = 2; xlog("$var(loglevel)", "time [$Tf] method ($rm) r-uri ($ru)\n"); ... +xlog("LOG_LOCAL3", "L_ERR", "this message will be sent to syslog facility LOG_LO +CAL3\n"); +... -5.2. xdbg(format) +5.2. xdbg(format) Print a formatted message using DBG function. @@ -239,12 +247,12 @@ xlog("$var(loglevel)", "time [$Tf] method ($rm) r-uri ($ru)\n"); xdbg("time $Cbx[$Tf]$Cxx method ($rm) r-uri ($ru)\n"); ... -5.3. xlogl([level],format) +5.3. xlogl([[facility,] level,] format) Similar to xlog(), in addition is printing cfg line number at the beginning of message. -5.4. xdbgl(format) +5.4. xdbgl(format) Similar to xdbg(), in addition is printing cfg line number at the beginning of message. diff --git a/modules_k/xlog/doc/xlog_admin.xml b/modules_k/xlog/doc/xlog_admin.xml index 2cbd363..e36ec046 100644 --- a/modules_k/xlog/doc/xlog_admin.xml +++ b/modules_k/xlog/doc/xlog_admin.xml @@ -205,7 +205,6 @@ modparam("xlog", "log_facility", "LOG_DAEMON") <para><emphasis>facility</emphasis> - The log facility that will be used for this single log message. </para> <para> - <para> If this parameter is missing, the implicit facility is either the facility set with the 'log_facility' module parameter or the core's log facility. </para>