nicko 2005/05/02 14:12:42
Modified: xdocs/src/release config-examples.xml faq.xml
xdocs/src/release/manual introduction.xml
Log:
Updated some references to the NDC and MDC
Revision Changes Path
1.11 +22 -22 logging-log4net/xdocs/src/release/config-examples.xml
Index: config-examples.xml
===================================================================
RCS file: /home/cvs/logging-log4net/xdocs/src/release/config-examples.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-examples.xml 2 May 2005 20:57:50 -0000 1.10
+++ config-examples.xml 2 May 2005 21:12:42 -0000 1.11
@@ -400,7 +400,7 @@
<source language="xml"><![CDATA[
<appender name="AspNetTraceAppender"
type="log4net.Appender.AspNetTraceAppender" >
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -456,7 +456,7 @@
<backColor value="Red, HighIntensity" />
</mapping>
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -475,7 +475,7 @@
<backColor value="Green" />
</mapping>
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -493,7 +493,7 @@
<source language="xml"><![CDATA[
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -504,7 +504,7 @@
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
<target value="Console.Error" />
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -522,7 +522,7 @@
<source language="xml"><![CDATA[
<appender name="EventLogAppender" type="log4net.Appender.EventLogAppender" >
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -534,7 +534,7 @@
<appender name="EventLogAppender" type="log4net.Appender.EventLogAppender" >
<applicationName value="MyApp" />
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -559,7 +559,7 @@
<file value="log-file.txt" />
<appendToFile value="true" />
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -574,7 +574,7 @@
<appendToFile value="true" />
<encoding value="unicodeFFFE" />
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -588,7 +588,7 @@
<appendToFile value="true" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -651,7 +651,7 @@
<server value="SQUARE" />
<recipient value="nicko" />
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -668,7 +668,7 @@
<source language="xml"><![CDATA[
<appender name="OutputDebugStringAppender"
type="log4net.Appender.OutputDebugStringAppender" >
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -741,7 +741,7 @@
<maximumFileSize value="100KB" />
<staticLogFileName value="true" />
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -759,7 +759,7 @@
<rollingStyle value="Date" />
<datePattern value="yyyyMMdd-HHmm" />
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -777,7 +777,7 @@
<maxSizeRollBackups value="10" />
<maximumFileSize value="1MB" />
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -798,7 +798,7 @@
<maxSizeRollBackups value="-1" />
<maximumFileSize value="50GB" />
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -830,7 +830,7 @@
<threshold value="WARN"/>
</evaluator>
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%newline%date [%thread] %-5level
%logger [%ndc] - %message%newline%newline%newline" />
+ <conversionPattern value="%newline%date [%thread] %-5level
%logger [%property{NDC}] - %message%newline%newline%newline" />
</layout>
</appender>
]]></source>
@@ -848,7 +848,7 @@
<bufferSize value="512" />
<lossy value="false" />
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%newline%date [%thread] %-5level
%logger [%ndc] - %message%newline%newline%newline" />
+ <conversionPattern value="%newline%date [%thread] %-5level
%logger [%property{NDC}] - %message%newline%newline%newline" />
</layout>
</appender>
]]></source>
@@ -867,7 +867,7 @@
<threshold value="WARN" />
</evaluator>
<layout type="log4net.Layout.PatternLayout,log4net">
- <conversionPattern value="%property{log4net:HostName} :: %level
:: %message %newlineLogger: %logger%newlineThread: %thread%newlineDate:
%date%newlineNDC: %ndc%newline%newline" />
+ <conversionPattern value="%property{log4net:HostName} :: %level
:: %message %newlineLogger: %logger%newlineThread: %thread%newlineDate:
%date%newlineNDC: %property{NDC}%newline%newline" />
</layout>
</appender>
]]></source>
@@ -909,7 +909,7 @@
<threshold value="WARN"/>
</evaluator>
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%newline%date [%thread] %-5level
%logger [%ndc] - %message%newline%newline%newline" />
+ <conversionPattern value="%newline%date [%thread] %-5level
%logger [%property{NDC}] - %message%newline%newline%newline" />
</layout>
</appender>
]]></source>
@@ -929,7 +929,7 @@
<source language="xml"><![CDATA[
<appender name="TraceAppender" type="log4net.Appender.TraceAppender">
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger
[%ndc] - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger
[%property{NDC}] - %message%newline" />
</layout>
</appender>
]]></source>
@@ -949,7 +949,7 @@
<remoteAddress value="224.0.0.1" />
<remotePort value="8080" />
<layout type="log4net.Layout.PatternLayout, log4net">
- <conversionPattern value="%-5level %logger [%ndc] -
%message%newline" />
+ <conversionPattern value="%-5level %logger [%property{NDC}] -
%message%newline" />
</layout>
</appender>
]]></source>
1.4 +4 -4 logging-log4net/xdocs/src/release/faq.xml
Index: faq.xml
===================================================================
RCS file: /home/cvs/logging-log4net/xdocs/src/release/faq.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- faq.xml 2 May 2005 20:57:50 -0000 1.3
+++ faq.xml 2 May 2005 21:12:42 -0000 1.4
@@ -593,16 +593,16 @@
most cases, this is not the
right approach.
</p>
<p>
- It is simpler to use a nested
diagnostic context (<span class="code">NDC</span>).
- Typically, one would <span
class="code">NDC.Push()</span>
+ It is simpler to use a context
property or stack (<span class="code">ThreadContext</span>).
+ Typically, one would <span
class="code">ThreadContext.Properties["ID"] = "XXX"</span>
client specific information,
such as the client's hostname, ID or any other
distinguishing information when
starting to handle the client's request.
- Thereafter, log output will
automatically include the nested diagnostic context
+ Thereafter, log output will
automatically include the context data
so that you can distinguish
logs from different client requests even if they
are output to the same file.
</p>
<p>
- See the <span
class="code">NDC</span> and the <span class="code">PatternLayout</span> classes
for more
+ See the <span
class="code">ThreadContext</span> and the <span
class="code">PatternLayout</span> classes for more
information.
</p>
</section>
1.7 +3 -1 logging-log4net/xdocs/src/release/manual/introduction.xml
Index: introduction.xml
===================================================================
RCS file:
/home/cvs/logging-log4net/xdocs/src/release/manual/introduction.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- introduction.xml 2 May 2005 20:57:50 -0000 1.6
+++ introduction.xml 2 May 2005 21:12:42 -0000 1.7
@@ -869,6 +869,7 @@
Matches
against a the start of the logger name.
</td>
</tr>
+ <!-- MDC and NDC
replaced by context properties
<tr>
<td><a
href="../sdk/log4net.Filter.MdcFilter.html">log4net.Filter.MdcFilter</a></td>
<td>
@@ -880,7 +881,8 @@
<td>
Matches
a substring from the event's <span class="code">NDC</span>.
</td>
- </tr>
+ </tr>
+ -->
<tr>
<td><a
href="../sdk/log4net.Filter.PropertyFilter.html">log4net.Filter.PropertyFilter</a></td>
<td>
