[21/50] [abbrv] logging-log4net git commit: fix anchor
fix anchor Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/79d4afaf Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/79d4afaf Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/79d4afaf Branch: refs/heads/master Commit: 79d4afafa57bd7f03c8e8d2c47871e3711daf48f Parents: 9ca5b01 Author: Stefan Bodewig Authored: Mon Jan 2 05:17:44 2017 + Committer: Stefan Bodewig Committed: Mon Jan 2 05:17:44 2017 + -- src/site/xdoc/release/release-notes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/79d4afaf/src/site/xdoc/release/release-notes.xml -- diff --git a/src/site/xdoc/release/release-notes.xml b/src/site/xdoc/release/release-notes.xml index cc8aced..10a366e 100644 --- a/src/site/xdoc/release/release-notes.xml +++ b/src/site/xdoc/release/release-notes.xml @@ -36,7 +36,7 @@ limitations under the License. package there is no reason to upgrade. - + [LOG4NET-540] - nuget dependencies for .NET Standard leak into net46
[07/50] [abbrv] logging-log4net git commit: make project.json consistent with nuspec
make project.json consistent with nuspec Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/6503f06a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/6503f06a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/6503f06a Branch: refs/heads/master Commit: 6503f06a31ea43e7aceb594df3ff5575ddf53c27 Parents: 176aef7 Author: Stefan Bodewig Authored: Sun Dec 4 11:16:53 2016 + Committer: Stefan Bodewig Committed: Sun Dec 4 11:16:53 2016 + -- netstandard/log4net/project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6503f06a/netstandard/log4net/project.json -- diff --git a/netstandard/log4net/project.json b/netstandard/log4net/project.json index bc47a32..41d9fe8 100644 --- a/netstandard/log4net/project.json +++ b/netstandard/log4net/project.json @@ -60,7 +60,7 @@ "System.Runtime.Extensions": "4.1.0", "System.Runtime.InteropServices": "4.1.0", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0", -"System.Runtime.Serialization.Formatters": "4.0.0-rc3-24212-01", +"System.Runtime.Serialization.Formatters": "4.0.0", "System.Text.RegularExpressions": "4.1.0", "System.Threading": "4.0.11", "System.Threading.Thread": "4.0.0",
[12/50] [abbrv] logging-log4net git commit: properly configure RAT
properly configure RAT Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/dd9b7638 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/dd9b7638 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/dd9b7638 Branch: refs/heads/master Commit: dd9b7638e59ee95d3f3b1ccbca6646adb424182d Parents: 7400504 Author: Stefan Bodewig Authored: Sun Dec 18 17:14:19 2016 + Committer: Stefan Bodewig Committed: Sun Dec 18 17:14:19 2016 + -- pom.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/dd9b7638/pom.xml -- diff --git a/pom.xml b/pom.xml index ad0af5f..02e0177 100644 --- a/pom.xml +++ b/pom.xml @@ -140,6 +140,7 @@ +**/TestResult.xml **/*.suo **/*.user **/obj/** @@ -149,11 +150,16 @@ src/log4net.xml src/GeneratedAssemblyInfo.cs tests/bin/** +netstandard/*/bin/** *.snk* tests/lib/prerequisites.txt - +CONTRIBUTING.md + + + **/*.json +
[26/50] [abbrv] logging-log4net git commit: LOG4NET-554 Use AsyncLocal for LogicalThreadContext
LOG4NET-554 Use AsyncLocal for LogicalThreadContext Patch by Thomas Clegg. closes #52 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/201ad1ae Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/201ad1ae Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/201ad1ae Branch: refs/heads/master Commit: 201ad1ae3ced298e77469f99e548244a7f772b06 Parents: c0b95f9 Author: Stefan Bodewig Authored: Fri Mar 3 21:45:41 2017 + Committer: Stefan Bodewig Committed: Fri Mar 3 21:45:41 2017 + -- netstandard/log4net.tests/log4net.tests.xproj | 1 + netstandard/log4net.tests/project.json | 1 + netstandard/log4net/log4net.xproj | 6 ++-- netstandard/log4net/project.json| 3 -- src/Core/LoggingEvent.cs| 6 ++-- src/Util/LogicalThreadContextProperties.cs | 31 ++-- .../PropertyPatternConverter.cs | 2 +- src/site/xdoc/release/framework-support.xml | 10 +-- tests/src/Context/LogicalThreadContextTest.cs | 2 +- tests/src/Utils.cs | 2 +- 10 files changed, 40 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/201ad1ae/netstandard/log4net.tests/log4net.tests.xproj -- diff --git a/netstandard/log4net.tests/log4net.tests.xproj b/netstandard/log4net.tests/log4net.tests.xproj index 00fecb3..92eecae 100644 --- a/netstandard/log4net.tests/log4net.tests.xproj +++ b/netstandard/log4net.tests/log4net.tests.xproj @@ -36,6 +36,7 @@ limitations under the License. + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/201ad1ae/netstandard/log4net.tests/project.json -- diff --git a/netstandard/log4net.tests/project.json b/netstandard/log4net.tests/project.json index 1e2396d..49af8d7 100644 --- a/netstandard/log4net.tests/project.json +++ b/netstandard/log4net.tests/project.json @@ -11,6 +11,7 @@ "../../tests/src/Appender/SmtpPickupDirAppenderTest.cs", "../../tests/src/Appender/StringAppender.cs", "../../tests/src/Appender/TraceAppenderTest.cs", + "../../tests/src/Context/LogicalThreadContextTest.cs", "../../tests/src/Context/ThreadContextTest.cs", "../../tests/src/Core/**/*.cs", "../../tests/src/DateFormatter/**/*.cs", http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/201ad1ae/netstandard/log4net/log4net.xproj -- diff --git a/netstandard/log4net/log4net.xproj b/netstandard/log4net/log4net.xproj index ff371a0..083a7a4 100644 --- a/netstandard/log4net/log4net.xproj +++ b/netstandard/log4net/log4net.xproj @@ -161,7 +161,7 @@ limitations under the License. - + @@ -201,9 +201,9 @@ limitations under the License. - + - + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/201ad1ae/netstandard/log4net/project.json -- diff --git a/netstandard/log4net/project.json b/netstandard/log4net/project.json index 75978e5..53164d9 100644 --- a/netstandard/log4net/project.json +++ b/netstandard/log4net/project.json @@ -16,7 +16,6 @@ "../../src/Appender/NetSendAppender.cs", "../../src/Appender/RemotingAppender.cs", "../../src/Appender/SmtpAppender.cs", -"../../src/LogicalThreadContext.cs", "../../src/Config/DOMConfigurator.cs", "../../src/Config/DOMConfiguratorAttribute.cs", "../../src/Config/Log4NetConfigurationSectionHandler.cs", @@ -30,8 +29,6 @@ "../../src/Plugin/RemoteLoggingServerPlugin.cs", "../../src/Util/PatternStringConverters/AppSettingPatternConverter.cs", "../../src/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs", -"../../src/Util/LogicalThreadContextProperties.cs", -"../../src/Util/LogicalThreadContextStacks.cs", "../../src/Util/NativeError.cs", "../../src/Util/WindowsSecurityContext.cs" ] http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/201ad1ae/src/Core/LoggingEvent.cs -- diff --git a/src/Core/LoggingEvent.cs b/src/Core/LoggingEvent.cs index fb9a506..eb54a60 100644 --- a/src/Core/LoggingEvent.cs +++ b/src/Core/LoggingEvent.cs @@ -461,7 +461,7 @@ namespace log4net.Core #region Protected Instance Construct
[40/50] [abbrv] logging-log4net git commit: LOG4NET-563 try to copy skin from log4j
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/df542d50/src/site/site.vm -- diff --git a/src/site/site.vm b/src/site/site.vm index 4b46bbf..370dd98 100644 --- a/src/site/site.vm +++ b/src/site/site.vm @@ -1,28 +1,50 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> + #macro ( link $href $name $target $img $position $alt $border $width $height ) - #set ( $linkTitle = ' title="' + $name + '"' ) - #if( $target ) -#set ( $linkTarget = ' target="' + $target + '"' ) - #else -#set ( $linkTarget = "" ) - #end - #if ( $href.toLowerCase().startsWith("http:/") || $href.toLowerCase().startsWith("https:/") || -$href.toLowerCase().startsWith("ftp:/") || $href.toLowerCase().startsWith("mailto:/";) || -$href.toLowerCase().startsWith("file:/") || ($href.toLowerCase().indexOf("://") != -1) ) -#set ( $linkClass = ' class="externalLink"' ) - #else -#set ( $linkClass = "" ) - #end - #if ( $img ) -#if ( $position == "left" ) - #image($img $alt $border $width $height)$name -#else - $name #image($img $alt $border $width $height) -#end - #else -$name - #end + #set ( $linkTitle = ' title="' + $name + '"' ) + #if( $target ) + #set ( $linkTarget = ' target="' + $target + '"' ) + #else + #set ( $linkTarget = "" ) + #end + #if ( $href.toLowerCase().startsWith("http:/") || $href.toLowerCase().startsWith("https:/") || + $href.toLowerCase().startsWith("ftp:/") || $href.toLowerCase().startsWith("mailto:/";) || + $href.toLowerCase().startsWith("file:/") || ($href.toLowerCase().indexOf("://") != -1) ) + #set ( $linkClass = ' class="external" target="_blank"' ) + + #if ( $linkTarget ) + #else + #set ( $linkTarget = "_blank" ) + #end + + #else + #set ( $linkClass = "" ) + #end + #if ( $img ) + #if ( $position == "left" ) + #image($img $alt $border $width $height)$name + #else + $name #image($img $alt $border $width $height) + #end + #else + $name + #end #end ## #macro ( image $img $alt $border $width $height ) @@ -104,163 +126,129 @@ #end ## #macro ( links $links ) - #set ( $counter = 0 ) - #foreach( $item in $links ) -#set ( $counter = $counter + 1 ) -#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) ) -#set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) ) -#link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height ) -#if ( $links.size() > $counter ) - | -#end - #end + + #set ( $counter = 0 ) + #foreach( $item in $links ) + #set ( $counter = $counter + 1 ) + #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) ) + #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) ) + #set ( $activeClass = "" ) + #if ( $alignedFileName == $currentItemHref) + #set ( $activeClass = ' class="active"' ) + #end + + #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height ) + + #end + #end ## #macro ( breadcrumbs $breadcrumbs ) - #foreach( $item in $breadcrumbs ) -#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) ) -#set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) ) -#if ( ( $currentItemHref == '' ) ) - #set ( $currentItemHref = './' ) -#end -## - #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height ) - > - #end - $title + #foreach( $item in $breadcrumbs ) + #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) ) + #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) ) + #if ( ( $currentItemHref == '' ) ) + #set ( $currentItemHref = './' ) + #end +## + #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height ) + > + #end + $title #end ## #macro ( displayTree $display $item ) - #if ( $item && $item.items && $item.items.size() > 0 ) -#foreach( $subitem in $item.items ) - #set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) ) - #set ( $subitemHref = $subitemHref.replaceAll( '\\', '/' ) ) -## - #if ( $alignedFileName == $subitemHref )
[35/50] [abbrv] logging-log4net git commit: typo
typo Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/4ea23f9a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/4ea23f9a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/4ea23f9a Branch: refs/heads/master Commit: 4ea23f9abd211c58a8cc98e9acc5d1c18bc710dd Parents: 2781b83 Author: Stefan Bodewig Authored: Wed Mar 15 10:10:24 2017 + Committer: Stefan Bodewig Committed: Wed Mar 15 10:10:24 2017 + -- src/Layout/Pattern/TypeNamePatternConverter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4ea23f9a/src/Layout/Pattern/TypeNamePatternConverter.cs -- diff --git a/src/Layout/Pattern/TypeNamePatternConverter.cs b/src/Layout/Pattern/TypeNamePatternConverter.cs index 8aea75b..acca1cb 100644 --- a/src/Layout/Pattern/TypeNamePatternConverter.cs +++ b/src/Layout/Pattern/TypeNamePatternConverter.cs @@ -53,7 +53,7 @@ namespace log4net.Layout.Pattern return string.Empty; } - if (logigngEvent.LocationInformation == null) + if (loggingEvent.LocationInformation == null) { return string.Empty; }
[22/50] [abbrv] logging-log4net git commit: bump version after 2.0.7 release
bump version after 2.0.7 release Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/8b4bc632 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/8b4bc632 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/8b4bc632 Branch: refs/heads/master Commit: 8b4bc6327987d30d8e2a54182b285146ccb9e879 Parents: 79d4afa Author: Stefan Bodewig Authored: Thu Jan 5 16:50:02 2017 + Committer: Stefan Bodewig Committed: Thu Jan 5 16:50:02 2017 + -- log4net.build | 2 +- log4net.nuspec | 2 +- log4net.shfbproj | 2 +- netstandard/log4net.tests/project.json | 2 +- netstandard/log4net/project.json | 2 +- pom.xml| 2 +- src/AssemblyVersionInfo.cpp| 4 ++-- src/AssemblyVersionInfo.cs | 4 ++-- src/AssemblyVersionInfo.js | 4 ++-- src/AssemblyVersionInfo.vb | 4 ++-- src/Log4netAssemblyInfo.cs | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8b4bc632/log4net.build -- diff --git a/log4net.build b/log4net.build index dde4de6..c924d0b 100644 --- a/log4net.build +++ b/log4net.build @@ -20,7 +20,7 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8b4bc632/log4net.nuspec -- diff --git a/log4net.nuspec b/log4net.nuspec index fc4cf92..51d8f31 100644 --- a/log4net.nuspec +++ b/log4net.nuspec @@ -22,7 +22,7 @@ http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd";> log4net -2.0.7 +2.0.8 Apache log4net The Apache log4net library is a tool to help the programmer output log statements to a variety of output targets. log4net is a tool to help the programmer output log statements to a variety of output targets. In case of problems with an application, it is helpful to enable logging so that the problem can be located. With log4net it is possible to enable logging at runtime without modifying the application binary. The log4net package is designed so that log statements can remain in shipped code without incurring a high performance cost. It follows that the speed of logging (or rather not logging) is crucial. http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8b4bc632/log4net.shfbproj -- diff --git a/log4net.shfbproj b/log4net.shfbproj index a883492..ee7a01e 100644 --- a/log4net.shfbproj +++ b/log4net.shfbproj @@ -33,7 +33,7 @@ limitations under the License. .NET Framework 3.5 doc\sdk\net\4.0\ -log4net-sdk-2.0.7 +log4net-sdk-2.0.8 en-US Standard Blank http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8b4bc632/netstandard/log4net.tests/project.json -- diff --git a/netstandard/log4net.tests/project.json b/netstandard/log4net.tests/project.json index b5c931b..1e2396d 100644 --- a/netstandard/log4net.tests/project.json +++ b/netstandard/log4net.tests/project.json @@ -1,5 +1,5 @@ { - "version": "2.0.7", + "version": "2.0.8", "buildOptions": { "compile": [ "../../tests/src/*.cs", http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8b4bc632/netstandard/log4net/project.json -- diff --git a/netstandard/log4net/project.json b/netstandard/log4net/project.json index c269c5f..75978e5 100644 --- a/netstandard/log4net/project.json +++ b/netstandard/log4net/project.json @@ -1,6 +1,6 @@ { "name": "log4net", - "version": "2.0.7", + "version": "2.0.8", "title": "Apache log4net for .NET Core", "copyright": "Copyright 2004-2017 The Apache Software Foundation.", "frameworks": { http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8b4bc632/pom.xml -- diff --git a/pom.xml b/pom.xml index 1205731..a957b15 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ log4net apache-log4net pom - 2.0.7 + 2.0.8 Apache log4net Logging framework for Microsoft .NET Framework. http://logging.apache.org/log4net/ http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8b4bc632/src/AssemblyVersionInfo.cpp -- diff --git a/src/AssemblyVersionInfo.cpp b/src/AssemblyVersionInfo.cpp index 1dc9eb5..ad93b2e 100644 --- a/src/AssemblyVersionInfo.cpp +++ b/src/AssemblyVer
[05/50] [abbrv] logging-log4net git commit: some Mono update has broken nant build
some Mono update has broken nant build Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/fae35211 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/fae35211 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/fae35211 Branch: refs/heads/master Commit: fae352112a7923c5511efb4fb8656b65a4324172 Parents: 2ada9ba Author: Stefan Bodewig Authored: Fri Dec 2 16:24:17 2016 + Committer: Stefan Bodewig Committed: Fri Dec 2 16:24:17 2016 + -- log4net.build | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/fae35211/log4net.build -- diff --git a/log4net.build b/log4net.build index e9ffe83..eb288c4 100644 --- a/log4net.build +++ b/log4net.build @@ -1260,10 +1260,10 @@ limitations under the License. - + - + @@ -1285,10 +1285,10 @@ limitations under the License. - + - + @@ -1309,10 +1309,10 @@ limitations under the License. - + - + @@ -1354,10 +1354,10 @@ limitations under the License. - + - + @@ -1380,10 +1380,10 @@ limitations under the License. - + - + @@ -1405,10 +1405,10 @@ limitations under the License. - + - + @@ -1451,10 +1451,10 @@ limitations under the License. - + - + @@ -1477,10 +1477,10 @@ limitations under the License. - + - + @@ -1502,10 +1502,10 @@ limitations under the License. - + - +
[37/50] [abbrv] logging-log4net git commit: update mailing lists section
update mailing lists section Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/b0769ac1 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/b0769ac1 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/b0769ac1 Branch: refs/heads/master Commit: b0769ac1171cd0f2b8eb604908ba7c69947b362b Parents: 87e8a49 Author: Stefan Bodewig Authored: Wed Apr 12 07:35:43 2017 + Committer: Stefan Bodewig Committed: Wed Apr 12 07:35:43 2017 + -- pom.xml | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b0769ac1/pom.xml -- diff --git a/pom.xml b/pom.xml index 94ded91..c3b7af1 100644 --- a/pom.xml +++ b/pom.xml @@ -46,18 +46,19 @@ - log4net-dev : log4net development - log4net-dev-subscr...@logging.apache.org - log4net-dev-unsubscr...@logging.apache.org - log4net-...@logging.apache.org - http://mail-archives.apache.org/mod_mbox/logging-log4net-dev/ + dev : development of the logging projects including log4net + dev-subscr...@logging.apache.org + dev-unsubscr...@logging.apache.org + d...@logging.apache.org + https://lists.apache.org/list.html?d...@logging.apache.org -http://marc.info/?l=log4net-dev - http://dir.gmane.org/gmane.comp.apache.logging.log4net.devel + http://mail-archives.apache.org/mod_mbox/logging-dev/ + - logging commits : all svn commits of the logging projects including log4net + logging commits : all svn/git commits of the logging projects including log4net commits-subscr...@logging.apache.org commits-unsubscr...@logging.apache.org Read-Only List
[17/50] [abbrv] logging-log4net git commit: bump version
bump version Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/0e1e66b6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/0e1e66b6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/0e1e66b6 Branch: refs/heads/master Commit: 0e1e66b6526fabef19468a683831c48c69af4ee0 Parents: 371f0f9 Author: Stefan Bodewig Authored: Sun Dec 25 13:58:40 2016 + Committer: Stefan Bodewig Committed: Sun Dec 25 13:58:40 2016 + -- log4net.build | 2 +- log4net.nuspec | 2 +- log4net.shfbproj | 2 +- netstandard/log4net.tests/project.json | 2 +- netstandard/log4net/project.json | 2 +- pom.xml| 2 +- src/AssemblyVersionInfo.cpp| 4 ++-- src/AssemblyVersionInfo.cs | 4 ++-- src/AssemblyVersionInfo.js | 4 ++-- src/AssemblyVersionInfo.vb | 4 ++-- src/Log4netAssemblyInfo.cs | 2 +- src/site/xdoc/download_log4net.xml | 20 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0e1e66b6/log4net.build -- diff --git a/log4net.build b/log4net.build index 4d5351e..dde4de6 100644 --- a/log4net.build +++ b/log4net.build @@ -20,7 +20,7 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0e1e66b6/log4net.nuspec -- diff --git a/log4net.nuspec b/log4net.nuspec index b45a7bf..3a0b42a 100644 --- a/log4net.nuspec +++ b/log4net.nuspec @@ -22,7 +22,7 @@ http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd";> log4net -2.0.6 +2.0.7 Apache log4net The Apache log4net library is a tool to help the programmer output log statements to a variety of output targets. log4net is a tool to help the programmer output log statements to a variety of output targets. In case of problems with an application, it is helpful to enable logging so that the problem can be located. With log4net it is possible to enable logging at runtime without modifying the application binary. The log4net package is designed so that log statements can remain in shipped code without incurring a high performance cost. It follows that the speed of logging (or rather not logging) is crucial. http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0e1e66b6/log4net.shfbproj -- diff --git a/log4net.shfbproj b/log4net.shfbproj index 86f1f4f..4cfe5af 100644 --- a/log4net.shfbproj +++ b/log4net.shfbproj @@ -33,7 +33,7 @@ limitations under the License. .NET Framework 3.5 doc\sdk\net\4.0\ -log4net-sdk-2.0.6 +log4net-sdk-2.0.7 en-US Standard Blank http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0e1e66b6/netstandard/log4net.tests/project.json -- diff --git a/netstandard/log4net.tests/project.json b/netstandard/log4net.tests/project.json index 7c88c8a..b5c931b 100644 --- a/netstandard/log4net.tests/project.json +++ b/netstandard/log4net.tests/project.json @@ -1,5 +1,5 @@ { - "version": "2.0.6", + "version": "2.0.7", "buildOptions": { "compile": [ "../../tests/src/*.cs", http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0e1e66b6/netstandard/log4net/project.json -- diff --git a/netstandard/log4net/project.json b/netstandard/log4net/project.json index 3f1e371..589214f 100644 --- a/netstandard/log4net/project.json +++ b/netstandard/log4net/project.json @@ -1,6 +1,6 @@ { "name": "log4net", - "version": "2.0.6", + "version": "2.0.7", "title": "Apache log4net for .NET Core", "copyright": "Copyright 2004-2016 The Apache Software Foundation.", "frameworks": { http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0e1e66b6/pom.xml -- diff --git a/pom.xml b/pom.xml index 02e0177..1205731 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ log4net apache-log4net pom - 2.0.6 + 2.0.7 Apache log4net Logging framework for Microsoft .NET Framework. http://logging.apache.org/log4net/ http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0e1e66b6/src/AssemblyVersionInfo.cpp -- diff --git a/src/AssemblyVersionInfo.cpp b/src/AssemblyVersionInfo.cpp index ef7d7e7..c12b2e3 100
[25/50] [abbrv] logging-log4net git commit: add 'TargetFramework' .NET Core
add 'TargetFramework' .NET Core Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/c0b95f94 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/c0b95f94 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/c0b95f94 Branch: refs/heads/master Commit: c0b95f947307f2e99c4ae711a345e6f568348c6e Parents: d1261ff Author: Stefan Bodewig Authored: Sun Feb 19 05:57:16 2017 + Committer: Stefan Bodewig Committed: Sun Feb 19 05:57:16 2017 + -- src/Log4netAssemblyInfo.cs | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/c0b95f94/src/Log4netAssemblyInfo.cs -- diff --git a/src/Log4netAssemblyInfo.cs b/src/Log4netAssemblyInfo.cs index 60337cc..c6a3b7b 100644 --- a/src/Log4netAssemblyInfo.cs +++ b/src/Log4netAssemblyInfo.cs @@ -59,6 +59,8 @@ namespace log4net { public const string TargetFramework = "Mono"; #elif SSCLI public const string TargetFramework = "Shared Source CLI"; +#elif NETSTANDARD1_3 +public const string TargetFramework = ".NET Core"; #else public const string TargetFramework = "Unknown"; #endif
[34/50] [abbrv] logging-log4net git commit: TypeNamePatternConverter: added a safety net of null checks to avoid null reference exceptions [LOG4NET-559]
TypeNamePatternConverter: added a safety net of null checks to avoid null reference exceptions [LOG4NET-559] Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/2781b83b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/2781b83b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/2781b83b Branch: refs/heads/master Commit: 2781b83bd1ef3a15dd7b0f17934fdbf22a691a35 Parents: 29be936 Author: Dominik Psenner Authored: Wed Mar 15 07:35:52 2017 + Committer: Dominik Psenner Committed: Wed Mar 15 07:35:52 2017 + -- src/Layout/Pattern/TypeNamePatternConverter.cs | 10 ++ 1 file changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/2781b83b/src/Layout/Pattern/TypeNamePatternConverter.cs -- diff --git a/src/Layout/Pattern/TypeNamePatternConverter.cs b/src/Layout/Pattern/TypeNamePatternConverter.cs index 0be4463..8aea75b 100644 --- a/src/Layout/Pattern/TypeNamePatternConverter.cs +++ b/src/Layout/Pattern/TypeNamePatternConverter.cs @@ -48,6 +48,16 @@ namespace log4net.Layout.Pattern /// override protected string GetFullyQualifiedName(LoggingEvent loggingEvent) { + if (loggingEvent == null) + { + return string.Empty; + } + + if (logigngEvent.LocationInformation == null) + { + return string.Empty; + } + return loggingEvent.LocationInformation.ClassName; } }
[48/50] [abbrv] logging-log4net git commit: LOG4NET-563 try to copy skin from log4j
LOG4NET-563 try to copy skin from log4j Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/df542d50 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/df542d50 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/df542d50 Branch: refs/heads/master Commit: df542d502d0f8ff1ed5f0f117b94503f291a0f0c Parents: 0d3c40a Author: Stefan Bodewig Authored: Fri Apr 21 19:26:40 2017 + Committer: Stefan Bodewig Committed: Fri Apr 21 19:26:40 2017 + -- pom.xml |1 + src/site/resources/css/bootstrap.css| 5893 +++ src/site/resources/css/bootstrap.min.css|9 + src/site/resources/css/maven-base.css | 168 - src/site/resources/css/site.css | 128 +- src/site/resources/images/collapsed.gif | Bin 0 -> 820 bytes src/site/resources/images/expanded.gif | Bin 0 -> 52 bytes .../resources/images/logos/maven-feather.png| Bin 3330 -> 0 bytes src/site/resources/images/maven-feather.png | Bin 0 -> 3330 bytes src/site/resources/images/od.gif| Bin 5741 -> 0 bytes .../img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes src/site/resources/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes src/site/resources/js/bootstrap.js | 2027 src/site/resources/js/bootstrap.min.js |6 + src/site/resources/js/jquery.js | 9266 ++ src/site/resources/js/jquery.min.js |4 + src/site/resources/js/prettify.js | 1477 +++ src/site/resources/js/prettify.min.js | 41 + src/site/resources/js/site.js | 113 + src/site/site.vm| 759 +- src/site/site.xml | 38 +- 21 files changed, 19330 insertions(+), 600 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/df542d50/pom.xml -- diff --git a/pom.xml b/pom.xml index c3b7af1..aebf9bf 100644 --- a/pom.xml +++ b/pom.xml @@ -150,6 +150,7 @@ doc/sdk/** src/log4net.xml src/GeneratedAssemblyInfo.cs +src/site/resources/** tests/bin/** netstandard/*/bin/**
[10/50] [abbrv] logging-log4net git commit: update site for 2.0.6, use .NET Standard rather than .NET Core in a few places
update site for 2.0.6, use .NET Standard rather than .NET Core in a few places Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f83f0ba0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f83f0ba0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f83f0ba0 Branch: refs/heads/master Commit: f83f0ba097e1a9a8f887bad57a23b3283166b534 Parents: bf0e4b0 Author: Stefan Bodewig Authored: Sun Dec 18 17:09:31 2016 + Committer: Stefan Bodewig Committed: Sun Dec 18 17:09:31 2016 + -- src/site/xdoc/release/faq.xml | 17 ++--- src/site/xdoc/release/framework-support.xml | 77 ++ src/site/xdoc/release/manual/introduction.xml | 2 +- src/site/xdoc/release/release-notes.xml | 29 +--- 4 files changed, 79 insertions(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f83f0ba0/src/site/xdoc/release/faq.xml -- diff --git a/src/site/xdoc/release/faq.xml b/src/site/xdoc/release/faq.xml index a67bcf2..e57cd7e 100644 --- a/src/site/xdoc/release/faq.xml +++ b/src/site/xdoc/release/faq.xml @@ -1226,16 +1226,13 @@ if(!log4net.LogManager.GetRepository().Configured) - - No, the log4net project doesn't provide a Nuget - package of its own, but http://blog.cincura.net/"; - rel="nofollow">JiÅÃ ÄinÄura has kindly - created a Nuget package he develops at https://github.com/cincuranet/log4net-nuget"; - rel="nofollow">https://github.com/cincuranet/log4net-nuget. - Please report any issues with the packaging at - his github issue tracker. + + Starting with version 2.0.6 we provide https://www.nuget.org/packages/log4net/"; + rel="nofollow">Nuget packages. For earlier + versions http://blog.cincura.net/"; + rel="nofollow">JiÅÃ ÄinÄura has kindly created + Nuget packages. Back to Top http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f83f0ba0/src/site/xdoc/release/framework-support.xml -- diff --git a/src/site/xdoc/release/framework-support.xml b/src/site/xdoc/release/framework-support.xml index 8e45565..f32389e 100644 --- a/src/site/xdoc/release/framework-support.xml +++ b/src/site/xdoc/release/framework-support.xml @@ -46,13 +46,7 @@ limitations under the License. does not guarantee forward compatibility only backward compatibility. -The lowest common denominator build is the CLI 1.0 Compatible build. This build is compatible with -the ECMA/ISO CLI 1.0 standard APIs and will run on all frameworks that support the standard. (Note -that the Microsoft .NET Compact Framework does not support this standard). Use this build if you -intend to deploy you application on both the Microsoft .NET Frameworks and the Mono frameworks. - - -log4net now builds on the following frameworks: +log4net is regularly built by its developers on the following frameworks: @@ -66,16 +60,8 @@ limitations under the License. Website -.NET Core 1.0 -http://www.dotnetfoundation.org/netcore";>http://www.dotnetfoundation.org/netcore - - -Microsoft .NET Framework 1.0 -http://msdn.microsoft.com/en-us/netframework/";>http://msdn.microsoft.com/en-us/netframework/ - - -Microsoft .NET Framework 1.1 -http://msdn.microsoft.com/en-us/netframework/";>http://msdn.microsoft.com/en-us/netframework/ +.NET Core 1.0 providing .NET Standard 1.3 +https://dotnet.github.io/";>https://dotnet.github.io/ Microsoft .NET Framework 2.0 @@ -102,6 +88,44 @@ limitations under the License. http://msdn.microsoft.com/en-us/netframework/";>http://msdn.microsoft.com/en-us/n
[49/50] [abbrv] logging-log4net git commit: merge back download page changes
merge back download page changes Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/6539c376 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/6539c376 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/6539c376 Branch: refs/heads/master Commit: 6539c37644af82eeff9ac7217ba96a9085d2df78 Parents: df542d5 Author: Stefan Bodewig Authored: Sat Apr 22 10:39:44 2017 + Committer: Stefan Bodewig Committed: Sat Apr 22 10:39:44 2017 + -- src/site/xdoc/download_log4net.xml | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6539c376/src/site/xdoc/download_log4net.xml -- diff --git a/src/site/xdoc/download_log4net.xml b/src/site/xdoc/download_log4net.xml index f089d4e..11c3982 100644 --- a/src/site/xdoc/download_log4net.xml +++ b/src/site/xdoc/download_log4net.xml @@ -77,14 +77,14 @@ limitations under the License. - + -log4net-2.0.7-src.zip - http://www.apache.org/dist/logging/log4net/source/log4net-2.0.7-src.zip.md5";>md5 - http://www.apache.org/dist/logging/log4net/source/log4net-2.0.7-src.zip.asc";>pgp +log4net-2.0.8-src.zip + http://www.apache.org/dist/logging/log4net/source/log4net-2.0.8-src.zip.md5";>md5 + http://www.apache.org/dist/logging/log4net/source/log4net-2.0.8-src.zip.asc";>pgp @@ -103,14 +103,14 @@ limitations under the License. -log4net-2.0.7-bin-newkey.zip - http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.7-bin-newkey.zip.md5";>md5 - http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.7-bin-newkey.zip.asc";>pgp +log4net-2.0.8-bin-newkey.zip + http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.8-bin-newkey.zip.md5";>md5 + http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.8-bin-newkey.zip.asc";>pgp -log4net-2.0.7-bin-oldkey.zip - http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.7-bin-oldkey.zip.md5";>md5 - http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.7-bin-oldkey.zip.asc";>pgp +log4net-2.0.8-bin-oldkey.zip + http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.8-bin-oldkey.zip.md5";>md5 + http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.8-bin-oldkey.zip.asc";>pgp
[27/50] [abbrv] logging-log4net git commit: LOG4NET-554 update class level documentation
LOG4NET-554 update class level documentation Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/96f56464 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/96f56464 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/96f56464 Branch: refs/heads/master Commit: 96f56464a5b9abbb547cf89717816fefa855e622 Parents: 201ad1a Author: Stefan Bodewig Authored: Fri Mar 3 21:55:10 2017 + Committer: Stefan Bodewig Committed: Fri Mar 3 21:55:10 2017 + -- src/LogicalThreadContext.cs| 5 + src/Util/LogicalThreadContextProperties.cs | 5 + 2 files changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/96f56464/src/LogicalThreadContext.cs -- diff --git a/src/LogicalThreadContext.cs b/src/LogicalThreadContext.cs index 40357c4..0403c42 100644 --- a/src/LogicalThreadContext.cs +++ b/src/LogicalThreadContext.cs @@ -38,6 +38,11 @@ namespace log4net /// properties with the same name. /// /// + /// For .NET Standard 1.3 this class uses + /// System.Threading.AsyncLocal rather than . + /// + /// /// The Logical Thread Context has a properties map and a stack. /// The properties and stack can /// be included in the output of log messages. The http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/96f56464/src/Util/LogicalThreadContextProperties.cs -- diff --git a/src/Util/LogicalThreadContextProperties.cs b/src/Util/LogicalThreadContextProperties.cs index 904229d..c5879fc 100644 --- a/src/Util/LogicalThreadContextProperties.cs +++ b/src/Util/LogicalThreadContextProperties.cs @@ -44,6 +44,11 @@ namespace log4net.Util /// log4net.Util.LogicalThreadContextProperties. /// /// + /// For .NET Standard 1.3 this class uses + /// System.Threading.AsyncLocal rather than . + /// + /// /// The requires a link time /// for the /// .
[41/50] [abbrv] logging-log4net git commit: LOG4NET-563 try to copy skin from log4j
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/df542d50/src/site/resources/js/prettify.js -- diff --git a/src/site/resources/js/prettify.js b/src/site/resources/js/prettify.js new file mode 100644 index 000..037c26d --- /dev/null +++ b/src/site/resources/js/prettify.js @@ -0,0 +1,1477 @@ +// Copyright (C) 2006 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +/** + * @fileoverview + * some functions for browser-side pretty printing of code contained in html. + * + * + * For a fairly comprehensive set of languages see the + * http://google-code-prettify.googlecode.com/svn/trunk/README.html#langs";>README + * file that came with this source. At a minimum, the lexer should work on a + * number of languages including C and friends, Java, Python, Bash, SQL, HTML, + * XML, CSS, Javascript, and Makefiles. It works passably on Ruby, PHP and Awk + * and a subset of Perl, but, because of commenting conventions, doesn't work on + * Smalltalk, Lisp-like, or CAML-like languages without an explicit lang class. + * + * Usage: + * include this source file in an html page via + * {@code } + * define style rules. See the example page for examples. + * mark the {@code } and {@code } tags in your source with + *{@code class=prettyprint.} + *You can also use the (html deprecated) {@code } tag, but the pretty + *printer needs to do more substantial DOM manipulations to support that, so + *some css styles may not be preserved. + * + * That's it. I wanted to keep the API as simple as possible, so there's no + * need to specify which language the code is in, but if you wish, you can add + * another class to the {@code } or {@code } element to specify the + * language, as in {@code }. Any class that + * starts with "lang-" followed by a file extension, specifies the file type. + * See the "lang-*.js" files in this directory for code that implements + * per-language file handlers. + * + * Change log: + * cbeust, 2006/08/22 + * + * Java annotations (start with "@") are now captured as literals ("lit") + * + * @requires console + */ + +// JSLint declarations +/*global console, document, navigator, setTimeout, window */ + +/** + * Split {@code prettyPrint} into multiple timeouts so as not to interfere with + * UI events. + * If set to {@code false}, {@code prettyPrint()} is synchronous. + */ +window['PR_SHOULD_USE_CONTINUATION'] = true; + +(function () { + // Keyword lists for various languages. + // We use things that coerce to strings to make them compact when minified + // and to defeat aggressive optimizers that fold large string constants. + var FLOW_CONTROL_KEYWORDS = ["break,continue,do,else,for,if,return,while"]; + var C_KEYWORDS = [FLOW_CONTROL_KEYWORDS,"auto,case,char,const,default," + + "double,enum,extern,float,goto,int,long,register,short,signed,sizeof," + + "static,struct,switch,typedef,union,unsigned,void,volatile"]; + var COMMON_KEYWORDS = [C_KEYWORDS,"catch,class,delete,false,import," + + "new,operator,private,protected,public,this,throw,true,try,typeof"]; + var CPP_KEYWORDS = [COMMON_KEYWORDS,"alignof,align_union,asm,axiom,bool," + + "concept,concept_map,const_cast,constexpr,decltype," + + "dynamic_cast,explicit,export,friend,inline,late_check," + + "mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast," + + "template,typeid,typename,using,virtual,where"]; + var JAVA_KEYWORDS = [COMMON_KEYWORDS, + "abstract,boolean,byte,extends,final,finally,implements,import," + + "instanceof,null,native,package,strictfp,super,synchronized,throws," + + "transient"]; + var CSHARP_KEYWORDS = [JAVA_KEYWORDS, + "as,base,by,checked,decimal,delegate,descending,dynamic,event," + + "fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock," + + "object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed," + + "stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"]; + var COFFEE_KEYWORDS = "all,and,by,catch,class,else,extends,false,finally," + + "for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then," + + "true,try,unless,until,when,while,yes"; + var JSCRIPT_KEYWORDS = [COMMON_KEYWORDS, + "debugger,eval,export,function,get,null,set,undefined,var,with," + + "Infinity,NaN"]; + var PERL_KEYWORDS = "caller,delete,die,do,dump,elsif,e
[14/50] [abbrv] logging-log4net git commit: use consistent versions of dependencies
use consistent versions of dependencies Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/2c96bcc7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/2c96bcc7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/2c96bcc7 Branch: refs/heads/master Commit: 2c96bcc7dbe829117504e4dd216af2376765bdde Parents: 1ff7451 Author: Stefan Bodewig Authored: Tue Dec 20 09:13:39 2016 + Committer: Stefan Bodewig Committed: Tue Dec 20 09:13:39 2016 + -- log4net.nuspec | 2 +- netstandard/log4net/project.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/2c96bcc7/log4net.nuspec -- diff --git a/log4net.nuspec b/log4net.nuspec index a7ef7b9..b45a7bf 100644 --- a/log4net.nuspec +++ b/log4net.nuspec @@ -59,7 +59,7 @@ log4net is designed with two distinct goals in mind: speed and flexibility - + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/2c96bcc7/netstandard/log4net/project.json -- diff --git a/netstandard/log4net/project.json b/netstandard/log4net/project.json index 91a39e5..3f1e371 100644 --- a/netstandard/log4net/project.json +++ b/netstandard/log4net/project.json @@ -60,7 +60,7 @@ "System.Runtime.Extensions": "4.1.0", "System.Runtime.InteropServices": "4.1.0", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0", -"System.Runtime.Serialization.Formatters": "4.0.0", +"System.Runtime.Serialization.Formatters": "4.3.0", "System.Text.RegularExpressions": "4.1.0", "System.Threading": "4.0.11", "System.Threading.Thread": "4.0.0",
[50/50] [abbrv] logging-log4net git commit: tweak reports, only publish RAT report
tweak reports, only publish RAT report Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/d5d8f2a2 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/d5d8f2a2 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/d5d8f2a2 Branch: refs/heads/master Commit: d5d8f2a22431d84f408ab890442979f8b50cabd1 Parents: 6539c37 Author: Stefan Bodewig Authored: Mon Apr 24 12:05:10 2017 + Committer: Stefan Bodewig Committed: Mon Apr 24 12:05:10 2017 + -- pom.xml | 14 ++ src/site/site.xml | 4 +++- 2 files changed, 5 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/d5d8f2a2/pom.xml -- diff --git a/pom.xml b/pom.xml index aebf9bf..0ad8b14 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ org.apache.rat apache-rat-plugin -0.11 +0.12 @@ -167,22 +167,12 @@ org.apache.maven.plugins maven-project-info-reports-plugin -${commons.project-info.version} - +2.8.1 cim scm - dependencies license project-team issue-tracking http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/d5d8f2a2/src/site/site.xml -- diff --git a/src/site/site.xml b/src/site/site.xml index 25ad9ba..286ef56 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -61,7 +61,9 @@ - + + + http://www.apache.org/"/>
[15/50] [abbrv] logging-log4net git commit: only move .NET Standard assembly currently created
only move .NET Standard assembly currently created Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/df881f28 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/df881f28 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/df881f28 Branch: refs/heads/master Commit: df881f2803a9123393791e94c7ac4c36ef2992c3 Parents: 2c96bcc Author: Stefan Bodewig Authored: Tue Dec 20 09:17:50 2016 + Committer: Stefan Bodewig Committed: Tue Dec 20 09:17:50 2016 + -- log4net.build | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/df881f28/log4net.build -- diff --git a/log4net.build b/log4net.build index eb288c4..4d5351e 100644 --- a/log4net.build +++ b/log4net.build @@ -1912,12 +1912,16 @@ limitations under the License. - - - - - - + + + + + + + + + +
[16/50] [abbrv] logging-log4net git commit: .NET Standard lacks LogicalThreadContext
.NET Standard lacks LogicalThreadContext Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/371f0f94 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/371f0f94 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/371f0f94 Branch: refs/heads/master Commit: 371f0f94ca9ed15646b7bef972f298eb2105e90f Parents: df881f2 Author: Stefan Bodewig Authored: Thu Dec 22 13:07:29 2016 + Committer: Stefan Bodewig Committed: Thu Dec 22 13:07:29 2016 + -- src/site/xdoc/release/framework-support.xml | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/371f0f94/src/site/xdoc/release/framework-support.xml -- diff --git a/src/site/xdoc/release/framework-support.xml b/src/site/xdoc/release/framework-support.xml index f32389e..7cf2b34 100644 --- a/src/site/xdoc/release/framework-support.xml +++ b/src/site/xdoc/release/framework-support.xml @@ -614,6 +614,9 @@ limitations under the License. anything related to ASP.NET (trace appender and several pattern converters) .NET Remoting + log4net.LogicalThreadContext + and the associated properties and stack + classes the colored console appender the event log appender The NetSendAppender
[30/50] [abbrv] logging-log4net git commit: LOG4NET-553 allow DebugAppender to skip category
LOG4NET-553 allow DebugAppender to skip category Patch by Jean-Francois Beaulac Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/c94bb14c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/c94bb14c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/c94bb14c Branch: refs/heads/master Commit: c94bb14cdb963529237424844e09e7eb7da155e5 Parents: 9397bca Author: Stefan Bodewig Authored: Tue Mar 7 19:13:06 2017 + Committer: Stefan Bodewig Committed: Tue Mar 7 19:13:06 2017 + -- netstandard/log4net.tests/log4net.tests.xproj | 1 + netstandard/log4net.tests/project.json| 1 + src/Appender/DebugAppender.cs | 39 - tests/src/Appender/DebugAppenderTest.cs | 173 + tests/src/log4net.Tests.vs2008.csproj | 3 + tests/src/log4net.Tests.vs2010.csproj | 3 + tests/src/log4net.Tests.vs2012.csproj | 1 + 7 files changed, 220 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/c94bb14c/netstandard/log4net.tests/log4net.tests.xproj -- diff --git a/netstandard/log4net.tests/log4net.tests.xproj b/netstandard/log4net.tests/log4net.tests.xproj index 92eecae..604afde 100644 --- a/netstandard/log4net.tests/log4net.tests.xproj +++ b/netstandard/log4net.tests/log4net.tests.xproj @@ -32,6 +32,7 @@ limitations under the License. + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/c94bb14c/netstandard/log4net.tests/project.json -- diff --git a/netstandard/log4net.tests/project.json b/netstandard/log4net.tests/project.json index 49af8d7..a7d9a86 100644 --- a/netstandard/log4net.tests/project.json +++ b/netstandard/log4net.tests/project.json @@ -6,6 +6,7 @@ "../../tests/src/Appender/AppenderCollectionTest.cs", "../../tests/src/Appender/BufferingAppenderTest.cs", "../../tests/src/Appender/CountingAppender.cs", + "../../tests/src/Appender/DebugAppenderTest.cs", "../../tests/src/Appender/MemoryAppenderTest.cs", "../../tests/src/Appender/RollingFileAppenderTest.cs", "../../tests/src/Appender/SmtpPickupDirAppenderTest.cs", http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/c94bb14c/src/Appender/DebugAppender.cs -- diff --git a/src/Appender/DebugAppender.cs b/src/Appender/DebugAppender.cs index 3cc5640..df6a618 100644 --- a/src/Appender/DebugAppender.cs +++ b/src/Appender/DebugAppender.cs @@ -100,6 +100,23 @@ namespace log4net.Appender set { m_immediateFlush = value; } } +/// +/// Formats the category parameter sent to the Debug method. +/// +/// +/// +/// Defaults to a with %logger as the pattern which will use the logger name of the current +/// as the category parameter. +/// +/// +/// +/// +public PatternLayout Category +{ +get { return m_category; } +set { m_category = value; } +} + #endregion Public Instance Properties #if !NETSTANDARD1_3 @@ -138,7 +155,22 @@ namespace log4net.Appender // // Write the string to the Debug system // - System.Diagnostics.Debug.Write(RenderLoggingEvent(loggingEvent), loggingEvent.LoggerName); +if(m_category == null) +{ + System.Diagnostics.Debug.Write(RenderLoggingEvent(loggingEvent)); +} +else +{ +string category = m_category.Format(loggingEvent); +if (string.IsNullOrEmpty(category)) +{ + System.Diagnostics.Debug.Write(RenderLoggingEvent(loggingEvent)); +} +else +{ + System.Diagnostics.Debug.Write(RenderLoggingEvent(loggingEvent), category); +} +} #if !NETSTANDARD1_3 // // Flush the Debug system if needed @@ -185,6 +217,11 @@ namespace log4net.Appender /// private bool m_immediateFlush = true; +/// +/// Defaults to a with %logger as the pattern. +/// +private PatternLayout m_category = new PatternLayout("%logger"); + #endregion Private Instance Fields } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/c94bb14c/tes
[45/50] [abbrv] logging-log4net git commit: LOG4NET-563 try to copy skin from log4j
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/df542d50/src/site/resources/css/maven-base.css -- diff --git a/src/site/resources/css/maven-base.css b/src/site/resources/css/maven-base.css deleted file mode 100644 index 7ef9c54..000 --- a/src/site/resources/css/maven-base.css +++ /dev/null @@ -1,168 +0,0 @@ -/* - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -*/ -body { - margin: 0px; - padding: 0px; -} -img { - border:none; -} -table { - padding:0px; - width: 100%; - margin-left: -2px; - margin-right: -2px; -} -acronym { - cursor: help; - border-bottom: 1px dotted #feb; -} -table.bodyTable th, table.bodyTable td { - padding: 2px 4px 2px 4px; - vertical-align: top; -} -div.clear{ - clear:both; - visibility: hidden; -} -div.clear hr{ - display: none; -} -#bannerLeft, #bannerRight { - font-size: xx-large; - font-weight: bold; -} -#bannerLeft img, #bannerRight img { - margin: 0px; -} -.xleft, #bannerLeft img { - float:left; -} -.xright, #bannerRight { - float:right; -} -#banner { - padding: 0px; -} -#banner img { - border: none; -} -#breadcrumbs { - padding: 3px 10px 3px 10px; -} -#leftColumn { - width: 170px; - float:left; - overflow: auto; -} -#bodyColumn { - margin-right: 1.5em; - margin-left: 197px; -} -#legend { - padding: 8px 0 8px 0; -} -#navcolumn { - padding: 8px 4px 0 8px; -} -#navcolumn h5 { - margin: 0; - padding: 0; - font-size: small; -} -#navcolumn ul { - margin: 0; - padding: 0; - font-size: small; -} -#navcolumn li { - list-style-type: none; - background-image: none; - background-repeat: no-repeat; - background-position: 0 0.4em; - padding-left: 16px; - list-style-position: outside; - line-height: 1.2em; - font-size: smaller; -} -#navcolumn li.expanded { - background-image: url(../images/expanded.gif); -} -#navcolumn li.collapsed { - background-image: url(../images/collapsed.gif); -} -#poweredBy { - text-align: center; -} -#navcolumn img { - margin-top: 10px; - margin-bottom: 3px; -} -#poweredBy img { - display:block; - margin: 20px 0 20px 17px; -} -#search img { -margin: 0px; -display: block; -} -#search #q, #search #btnG { -border: 1px solid #999; -margin-bottom:10px; -} -#search form { -margin: 0px; -} -#lastPublished { - font-size: x-small; -} -.navSection { - margin-bottom: 2px; - padding: 8px; -} -.navSectionHead { - font-weight: bold; - font-size: x-small; -} -.section { - padding: 4px; -} -#footer { - padding: 3px 10px 3px 10px; - font-size: x-small; -} -#breadcrumbs { - font-size: x-small; - margin: 0pt; -} -.source { - padding: 12px; - margin: 1em 7px 1em 7px; -} -.source pre { - margin: 0px; - padding: 0px; -} -#navcolumn img.imageLink, .imageLink{ - padding-left: 0px; - padding-bottom: 0px; - padding-top: 0px; - padding-right: 2px; - border: 0px; - margin: 0px; -} http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/df542d50/src/site/resources/css/site.css -- diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css index 6005ace..472df16 100644 --- a/src/site/resources/css/site.css +++ b/src/site/resources/css/site.css @@ -1,22 +1,114 @@ /* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + thi
[06/50] [abbrv] logging-log4net git commit: releases must not have dependencies on pre-releases
releases must not have dependencies on pre-releases Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/176aef70 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/176aef70 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/176aef70 Branch: refs/heads/master Commit: 176aef7025c2c4e605e60b4afb866c25e55978c8 Parents: fae3521 Author: Stefan Bodewig Authored: Fri Dec 2 16:30:44 2016 + Committer: Stefan Bodewig Committed: Fri Dec 2 16:30:44 2016 + -- log4net.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/176aef70/log4net.nuspec -- diff --git a/log4net.nuspec b/log4net.nuspec index 640441e..29a8611 100644 --- a/log4net.nuspec +++ b/log4net.nuspec @@ -59,7 +59,7 @@ log4net is designed with two distinct goals in mind: speed and flexibility - +
[02/50] [abbrv] logging-log4net git commit: LOG4NET-536 NETCF cannot compile LogicalThreadContextStacks
LOG4NET-536 NETCF cannot compile LogicalThreadContextStacks Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/9f69a10f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/9f69a10f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/9f69a10f Branch: refs/heads/master Commit: 9f69a10f39c7640d3f98c79311f6aef8fd89b43e Parents: 76f0151 Author: Stefan Bodewig Authored: Tue Nov 29 19:43:25 2016 + Committer: Stefan Bodewig Committed: Tue Nov 29 19:43:25 2016 + -- src/Util/LogicalThreadContextStack.cs | 2 ++ src/Util/LogicalThreadContextStacks.cs | 2 ++ 2 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9f69a10f/src/Util/LogicalThreadContextStack.cs -- diff --git a/src/Util/LogicalThreadContextStack.cs b/src/Util/LogicalThreadContextStack.cs index 779d5a1..d251f75 100644 --- a/src/Util/LogicalThreadContextStack.cs +++ b/src/Util/LogicalThreadContextStack.cs @@ -17,6 +17,7 @@ // #endregion +#if !NETCF using System; using System.Collections; @@ -425,3 +426,4 @@ namespace log4net.Util } } +#endif \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9f69a10f/src/Util/LogicalThreadContextStacks.cs -- diff --git a/src/Util/LogicalThreadContextStacks.cs b/src/Util/LogicalThreadContextStacks.cs index bafae16..3554cf3 100644 --- a/src/Util/LogicalThreadContextStacks.cs +++ b/src/Util/LogicalThreadContextStacks.cs @@ -17,6 +17,7 @@ // #endregion +#if !NETCF using System; using System.Collections; @@ -139,3 +140,4 @@ namespace log4net.Util } } +#endif
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.10 [created] d61392a3d refs/tags/1.2.10-RC2 [created] a8ca21fe2 refs/tags/1.2.11 [created] 957ba3692 refs/tags/1.2.11-RC1 [created] b067cc41c refs/tags/1.2.12 [created] 03f60f6c1 refs/tags/1.2.12-RC1 [created] ed8c85bc1 refs/tags/1.2.13 [created] d52532cb7 refs/tags/1.2.13-RC1 [created] 91c7447bb refs/tags/1.2.13-RC2 [created] ea3206457 refs/tags/1.2.13-RC3 [created] 44fff1715 refs/tags/1.2.14 [created] 213971142 refs/tags/1.2.14-RC1 [created] ffc247522 refs/tags/1.2.14-RC2 [created] 5e045da83 refs/tags/1.2.15 [created] 6151e7f73 refs/tags/1.2.15-RC1 [created] 7ae407601 refs/tags/1.2.9 [created] 18a96716a refs/tags/2.0.6 [created] 5059de001 refs/tags/2.0.6-RC1 [created] 21f14dcad refs/tags/2.0.7 [created] e0ba3317f refs/tags/2.0.7-RC1 [created] 1ebdafb1a refs/tags/2.0.8 [created] cd20f62a7 refs/tags/2.0.8-RC1 [created] 9faf43420
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Branches: refs/heads/origin/trunk [deleted] fecc9fb7d
[4/4] logging-log4net git commit: LOG4NET-478 API-based defines rather than version based. Based on patch by NN.
LOG4NET-478 API-based defines rather than version based. Based on patch by NN. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/66bdcb14 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/66bdcb14 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/66bdcb14 Branch: refs/heads/log4net-1.3.x Commit: 66bdcb14261a76d5bf4ba84c670f73306ba4326c Parents: a4427aa Author: Stefan Bodewig Authored: Sun Oct 25 12:08:36 2015 + Committer: Stefan Bodewig Committed: Sun Oct 25 12:08:36 2015 + -- src/buildsupport/configure-framework.include| 24 ++-- .../Context/LogicalThreadContextTest.cs | 2 +- src/log4net.Tests/log4net.Tests.vs2010.csproj | 2 +- src/log4net.Tests/log4net.Tests.vs2012.csproj | 2 +- src/log4net/Appender/AsyncAppender.cs | 14 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/66bdcb14/src/buildsupport/configure-framework.include -- diff --git a/src/buildsupport/configure-framework.include b/src/buildsupport/configure-framework.include index 90749fa..078d330 100644 --- a/src/buildsupport/configure-framework.include +++ b/src/buildsupport/configure-framework.include @@ -70,9 +70,9 @@ limitations under the License. - - - + + + @@ -85,9 +85,9 @@ limitations under the License. - - - + + + @@ -100,9 +100,9 @@ limitations under the License. - - - + + + @@ -156,9 +156,9 @@ limitations under the License. - - - + + + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/66bdcb14/src/log4net.Tests/Context/LogicalThreadContextTest.cs -- diff --git a/src/log4net.Tests/Context/LogicalThreadContextTest.cs b/src/log4net.Tests/Context/LogicalThreadContextTest.cs index 5ac0a24..5549e44 100644 --- a/src/log4net.Tests/Context/LogicalThreadContextTest.cs +++ b/src/log4net.Tests/Context/LogicalThreadContextTest.cs @@ -17,7 +17,7 @@ // #endregion -#if FRAMEWORK_4_5_OR_ABOVE +#if HAS_ASYNC_AWAIT using System; using System.Threading.Tasks; using System.Linq; http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/66bdcb14/src/log4net.Tests/log4net.Tests.vs2010.csproj -- diff --git a/src/log4net.Tests/log4net.Tests.vs2010.csproj b/src/log4net.Tests/log4net.Tests.vs2010.csproj index 392c4f2..bde9715 100644 --- a/src/log4net.Tests/log4net.Tests.vs2010.csproj +++ b/src/log4net.Tests/log4net.Tests.vs2010.csproj @@ -72,7 +72,7 @@ false - TRACE;DEBUG;DOTNET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE + TRACE;DEBUG;DOTNET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE;HAS_TPL true http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/66bdcb14/src/log4net.Tests/log4net.Tests.vs2012.csproj -- diff --git a/src/log4net.Tests/log4net.Tests.vs2012.csproj b/src/log4net.Tests/log4net.Tests.vs2012.csproj index 4295e27..b4f9b05 100644 --- a/src/log4net.Tests/log4net.Tests.vs2012.csproj +++ b/src/log4net.Tests/log4net.Tests.vs2012.csproj @@ -72,7 +72,7 @@ false - TRACE;DEBUG;DOTNET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE;FRAMEWORK_4_5_OR_ABOVE + TRACE;DEBUG;DOTNET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE;FRAMEWORK_4_5_OR_ABOVE;HAS_TPL;HAS_ASYNC_AWAIT true http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/66bdcb14/src/log4net/Appender/AsyncAppender.cs -- diff --git a/src/log4net/Appender/AsyncAppender.cs b/src/log4net/Appender/AsyncAppender.cs index da6932a..eb11c5a 100644 --- a/src/log4net/Appender/AsyncAppender.cs +++ b/src/log4net/Appender/AsyncAppender.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; -#if FRAMEWORK_4_0_OR_ABOVE +#if HAS_TPL using System.Threading.Tasks; #else using System.Threading; @@ -46,7 +46,7 @@ namespace log4net.Appender /// public AsyncAppender() { -#if FRAMEWORK_4_0_OR_ABOVE +#if HAS_TPL logTask = new Task(() => { }); logTask.Start(); #endif @@ -92,7 +92,7 @@ namespace log4net.Appender } events.Add(loggingEvent); }
[1/4] logging-log4net git commit: copy trunk to 1.3.x branch
Repository: logging-log4net Updated Branches: refs/heads/log4net-1.3.x [created] 66bdcb142 copy trunk to 1.3.x branch Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/016514b0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/016514b0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/016514b0 Branch: refs/heads/log4net-1.3.x Commit: 016514b00586be975baf7828582ea3c85c94b933 Parents: bddc041 Author: Stefan Bodewig Authored: Wed Oct 7 03:49:48 2015 + Committer: Stefan Bodewig Committed: Wed Oct 7 03:49:48 2015 + -- --
[3/4] logging-log4net git commit: LOG4NET-480 tests don't work when using the not really supported VS2008 build - patch due to NN
LOG4NET-480 tests don't work when using the not really supported VS2008 build - patch due to NN Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/a4427aa7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/a4427aa7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/a4427aa7 Branch: refs/heads/log4net-1.3.x Commit: a4427aa715a0e453d91d016f632270d639abc042 Parents: dd45791 Author: Stefan Bodewig Authored: Sun Oct 25 12:01:23 2015 + Committer: Stefan Bodewig Committed: Sun Oct 25 12:01:23 2015 + -- src/log4net.Tests/log4net.Tests.vs2008.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/a4427aa7/src/log4net.Tests/log4net.Tests.vs2008.csproj -- diff --git a/src/log4net.Tests/log4net.Tests.vs2008.csproj b/src/log4net.Tests/log4net.Tests.vs2008.csproj index 5492c24..8d9c682 100644 --- a/src/log4net.Tests/log4net.Tests.vs2008.csproj +++ b/src/log4net.Tests/log4net.Tests.vs2008.csproj @@ -57,7 +57,7 @@ false -TRACE;DEBUG + TRACE;DEBUG;DOTNET;FRAMEWORK_3_5_OR_ABOVE true @@ -77,7 +77,7 @@ false -TRACE +TRACE;DOTNET;FRAMEWORK_3_5_OR_ABOVE true
[2/4] logging-log4net git commit: LOG4NET-479 fix vs2008 build, patch due to NN
LOG4NET-479 fix vs2008 build, patch due to NN Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/dd457919 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/dd457919 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/dd457919 Branch: refs/heads/log4net-1.3.x Commit: dd457919c66eff742e9df0185418c88cb9bd72d1 Parents: 016514b Author: Stefan Bodewig Authored: Sun Oct 25 11:56:52 2015 + Committer: Stefan Bodewig Committed: Sun Oct 25 11:56:52 2015 + -- src/log4net/log4net.vs2008.csproj | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/dd457919/src/log4net/log4net.vs2008.csproj -- diff --git a/src/log4net/log4net.vs2008.csproj b/src/log4net/log4net.vs2008.csproj index fecd2d7..0f652f7 100644 --- a/src/log4net/log4net.vs2008.csproj +++ b/src/log4net/log4net.vs2008.csproj @@ -698,9 +698,15 @@ Code + + Code + Code + + Code + Code
[1/2] logging-log4net git commit: This migrates the visual studio solution to Visual Studio 14
Repository: logging-log4net Updated Branches: refs/heads/feature/RollingFileAppender-NG [created] 829b2eb59 This migrates the visual studio solution to Visual Studio 14 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/cde6b690 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/cde6b690 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/cde6b690 Branch: refs/heads/feature/RollingFileAppender-NG Commit: cde6b690082bf80b0261d3e3ead5bc369845f36c Parents: e9a9bb6 Author: Dominik Psenner Authored: Fri May 19 21:38:10 2017 +0200 Committer: Dominik Psenner Committed: Fri May 19 21:38:10 2017 +0200 -- src/log4net.vs2012.csproj | 4 ++-- src/log4net.vs2012.sln| 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/cde6b690/src/log4net.vs2012.csproj -- diff --git a/src/log4net.vs2012.csproj b/src/log4net.vs2012.csproj index 05a7062..bcf045f 100644 --- a/src/log4net.vs2012.csproj +++ b/src/log4net.vs2012.csproj @@ -1,4 +1,4 @@ - +
[2/2] logging-log4net git commit: An initial commit of the rolling file appender ng implementation [LOG4NET-367]
An initial commit of the rolling file appender ng implementation [LOG4NET-367] Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/829b2eb5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/829b2eb5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/829b2eb5 Branch: refs/heads/feature/RollingFileAppender-NG Commit: 829b2eb59d14caa0bcbfeeea34c65154741b9b4c Parents: cde6b69 Author: Dominik Psenner Authored: Fri May 19 21:47:32 2017 +0200 Committer: Dominik Psenner Committed: Fri May 19 21:47:32 2017 +0200 -- src/Appender/Rolling/CronRollingCondition.cs| 230 +++ src/Appender/Rolling/IRollingCondition.cs | 38 +++ src/Appender/Rolling/IRollingStrategy.cs| 36 +++ src/Appender/Rolling/IndexRollingStrategy.cs| 77 +++ src/Appender/RollingFileAppenderNG.cs | 152 .../Rolling/CronRollingConditionTest.cs | 45 .../Rolling/IndexRollingStrategyTest.cs | 83 +++ tests/src/log4net.Tests.vs2012.csproj | 2 + 8 files changed, 663 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/829b2eb5/src/Appender/Rolling/CronRollingCondition.cs -- diff --git a/src/Appender/Rolling/CronRollingCondition.cs b/src/Appender/Rolling/CronRollingCondition.cs new file mode 100644 index 000..f355648 --- /dev/null +++ b/src/Appender/Rolling/CronRollingCondition.cs @@ -0,0 +1,230 @@ +#region Apache License +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to you under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#endregion + +using System; +using System.IO; + +namespace log4net.Appender.Rolling +{ +/// +/// A implementation of the interface that rolls +/// the file cronologically. +/// +/// Dominik Psenner +public class CronRollingCondition : IRollingCondition +{ +#region Public Instance Constructors + +public CronRollingCondition() +: this("*", "*", "*", "*", "*") +{ +} + +public CronRollingCondition(string dow, string month, string day, string hour, string minute) +{ +Dow = TryParse(dow); +Month = TryParse(month); +Day = TryParse(day); +Hour = TryParse(hour); +Minute = TryParse(minute); +} + +#endregion + +#region Protected Instance Properties + +protected Tuple Dow { get; private set; } +protected Tuple Month { get; private set; } +protected Tuple Day { get; private set; } +protected Tuple Hour { get; private set; } +protected Tuple Minute { get; private set; } + +#endregion + +#region Private Instance Properties + +private ulong last_rolled = 0; + +#endregion + +#region Protected Inner Classes + +protected enum MatchType +{ +Nothing, +Exact, +Remainder, +} + +#endregion + +#region Protected Static Methods + +/// +/// This method parses a string to match any of these: +/// i +/// * +/// */i +/// +/// +/// +static protected Tuple TryParse(string input) +{ +// trim input and strip empty spaces +string inputParsed = input.Trim().Replace(" ", "").Replace("\t", ""); + +// match a remainder: */c +if (inputParsed.StartsWith("*/") || inputParsed.StartsWith(@"*\")) +{ +// strip first two chars +inputParsed = inputParsed.Substring(2); +// parse the remainder +int i = -1; +if (int.TryParse(inputParsed, out i)) +{ +return Tuple.Create(i, MatchType.Remainder); +} +} +else if (inputParsed.StartsWith("*")) // match anything: * +{ +return Tuple.Creat
logging-log4net git commit: This adds newly added files in the solution for vs2012
Repository: logging-log4net Updated Branches: refs/heads/feature/RollingFileAppender-NG 829b2eb59 -> bce5e7a44 This adds newly added files in the solution for vs2012 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/bce5e7a4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/bce5e7a4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/bce5e7a4 Branch: refs/heads/feature/RollingFileAppender-NG Commit: bce5e7a448e31c26f39463603b8170ae4f5c2af2 Parents: 829b2eb Author: Dominik Psenner Authored: Fri May 19 22:13:42 2017 +0200 Committer: Dominik Psenner Committed: Fri May 19 22:13:42 2017 +0200 -- src/log4net.vs2012.csproj | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/bce5e7a4/src/log4net.vs2012.csproj -- diff --git a/src/log4net.vs2012.csproj b/src/log4net.vs2012.csproj index bcf045f..a7ee576 100644 --- a/src/log4net.vs2012.csproj +++ b/src/log4net.vs2012.csproj @@ -191,6 +191,11 @@ Code + + + + + Code
[1/4] logging-log4net git commit: Removed historical solutions and csproj files
Repository: logging-log4net Updated Branches: refs/heads/feature/RollingFileAppender-NG bce5e7a44 -> f7e2aaec0 http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f5fdf89f/tests/src/log4net.Tests.vs2008.csproj -- diff --git a/tests/src/log4net.Tests.vs2008.csproj b/tests/src/log4net.Tests.vs2008.csproj deleted file mode 100644 index 5bbb7c9..000 --- a/tests/src/log4net.Tests.vs2008.csproj +++ /dev/null @@ -1,224 +0,0 @@ - - - -http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> - -Local -9.0.30729 -2.0 -{B0530F10-0238-49A9-93B0-8EF412E90BCF} -Debug -AnyCPU - - - - -log4net.Tests - - -JScript -Grid -IE50 -false -Library -log4net.Tests - - - - - - -2.0 -v3.5 - - -..\bin\Debug\ -false -285212672 -false - - -TRACE;DEBUG;NET_2_0 - - -true -4096 -false -false -false -false -4 -full -prompt - - -..\bin\Release\ -false -285212672 -false - - -TRACE - - -false -4096 -true -false -false -false -4 -none -prompt - - - - False - ..\..\..\ibatisnet-3\External-Bin\Net\2.0\nunit.framework.dll - - - System - - - - 3.5 - - - System.Data - - - System.Runtime.Remoting - - - System.XML - - - - - AssemblyVersionInfo.cs - Code - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - - - Code - - - Code - - - - - - - Code - - - Code - - - Code - - - Code - - - - - {181FE707-E161-4722-9F38-6AAAB6FAA106} - log4net.vs2008 - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f5fdf89f/tests/src/log4net.Tests.vs2010.csproj -- diff --git a/tests/src/log4net.Tests.vs2010.csproj b/tests/src/log4net.Tests.vs2010.csproj deleted file mode 100644 index 407fc68..000 --- a/tests/src/log4net.Tests.vs2010.csproj +++ /dev/null @@ -1,257 +0,0 @@ - - -http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> - -Local -9.0.30729 -2.0 -{B0530F10-0238-49A9-93B0-8EF412E90BCF} -Debug -AnyCPU - - - - -log4net.Tests - - -JScript -Grid -IE50 -false -Library -log4net.Tests - - - - - - -3.5 -v4.0 -publish\ -true -Disk -false -Foreground -7 -Days -false -false -true -0 -1.0.0.%2a -false -false -true - - - -..\bin\Debug\ -false -285212672 -false - - -TRACE;DEBUG;NET;NET_2_0;NET_4_0 - - -true -4096 -false -false -false -false -4 -full -prompt -AllRules.ruleset - - -..\bin\Release\ -false -285212672 -false - - -TRACE;NET;NET_2_0;NET_4_0 - - -false -4096 -true -false -false -false -4 -none -prompt -AllRules.ruleset - - - - False - ..\..\..\ibatisnet-3\External-Bin\Net\2.0\nunit.framework.dll - - - System - - - - 3.5 - - - System.Data - - - System.Runtime.Remoting - - - System.XML - - - - - AssemblyVersionInfo.cs - Code - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - - Code - - - Code - - - - - Code - - - Code - - - - - - - Code - - - Code - - - Code - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true -
[4/4] logging-log4net git commit: Merge branch 'develop' into feature/RollingFileAppender-NG
Merge branch 'develop' into feature/RollingFileAppender-NG # Conflicts: # src/log4net.sln Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f7e2aaec Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f7e2aaec Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f7e2aaec Branch: refs/heads/feature/RollingFileAppender-NG Commit: f7e2aaec059a88b92b25d4e7792b0e0a645ebac6 Parents: bce5e7a f5fdf89 Author: Dominik Psenner Authored: Mon May 22 22:34:57 2017 +0200 Committer: Dominik Psenner Committed: Mon May 22 22:34:57 2017 +0200 -- src/log4net.csproj| 813 + src/log4net.sln | 48 ++ src/log4net.vs2008.csproj | 775 --- src/log4net.vs2008.sln| 45 -- src/log4net.vs2010.csproj | 808 src/log4net.vs2010.sln| 45 -- src/log4net.vs2012.csproj | 813 - src/log4net.vs2012.sln| 48 -- tests/src/log4net.Tests.csproj| 265 ++ tests/src/log4net.Tests.vs2003.csproj | 293 --- tests/src/log4net.Tests.vs2008.csproj | 224 tests/src/log4net.Tests.vs2010.csproj | 257 - tests/src/log4net.Tests.vs2012.csproj | 265 -- 13 files changed, 1126 insertions(+), 3573 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f7e2aaec/src/log4net.csproj -- diff --cc src/log4net.csproj index 000,05a7062..a7ee576 mode 00,100644..100644 --- a/src/log4net.csproj +++ b/src/log4net.csproj @@@ -1,0 -1,808 +1,813 @@@ - ++ + + http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> + + Local + 9.0.30729 + 2.0 + {181FE707-E161-4722-9F38-6AAAB6FAA106} + Debug + AnyCPU + + + + + log4net + + + JScript + Grid + IE50 + false + Library + log4net + + + + + + + 3.5 + v4.5 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + + ..\build\bin\net\4.5\debug\ + false + 285212672 + false + + + TRACE;DEBUG;NET;NET_2_0;NET_4_0;NET_4_5 + log4net.xml + true + 4096 + false + false + false + false + 4 + full + prompt + SecurityRules.ruleset + + + ..\build\bin\net\4.5\release\ + false + 285212672 + false + + + TRACE;STRONG;NET;NET_2_0;NET_4_0;NET_4_5 + log4net.xml + false + 4096 + true + false + false + false + 4 + none + prompt + AllRules.ruleset + + + + System + + + + System.Data + + + System.Web + + + System.XML + + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + ++ ++ ++ ++ ++ + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + +
[2/4] logging-log4net git commit: Removed historical solutions and csproj files
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f5fdf89f/src/log4net.vs2010.csproj -- diff --git a/src/log4net.vs2010.csproj b/src/log4net.vs2010.csproj deleted file mode 100644 index 7865f1e..000 --- a/src/log4net.vs2010.csproj +++ /dev/null @@ -1,808 +0,0 @@ - - -http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> - -Local -9.0.30729 -2.0 -{181FE707-E161-4722-9F38-6AAAB6FAA106} -Debug -AnyCPU - - - - -log4net - - -JScript -Grid -IE50 -false -Library -log4net - - - - - - -3.5 -v4.0 -publish\ -true -Disk -false -Foreground -7 -Days -false -false -true -0 -1.0.0.%2a -false -false -true - - - -..\build\bin\net\4.0\debug\ -false -285212672 -false - - -TRACE;DEBUG;NET;NET_2_0;NET_4_0 -log4net.xml -true -4096 -false -false -false -false -4 -full -prompt -SecurityRules.ruleset - - -..\build\bin\net\4.0\release\ -false -285212672 -false - - -TRACE;STRONG;NET;NET_2_0;NET_4_0 -log4net.xml -false -4096 -true -false -false -false -4 -none -prompt -AllRules.ruleset - - - - System - - - - System.Data - - - System.Web - - - System.XML - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code -
[3/4] logging-log4net git commit: Removed historical solutions and csproj files
Removed historical solutions and csproj files We decided that from now on we are going to maintain only one solution file and when someone would want to migrate to a new visual studio version a lazy vote should be started. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f5fdf89f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f5fdf89f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f5fdf89f Branch: refs/heads/feature/RollingFileAppender-NG Commit: f5fdf89fdfb27ea76a500f962690b14eafadcac2 Parents: e9a9bb6 Author: Dominik Psenner Authored: Mon May 22 21:36:12 2017 +0200 Committer: Dominik Psenner Committed: Mon May 22 22:31:53 2017 +0200 -- src/log4net.csproj| 808 + src/log4net.sln | 45 ++ src/log4net.vs2008.csproj | 775 --- src/log4net.vs2008.sln| 45 -- src/log4net.vs2010.csproj | 808 - src/log4net.vs2010.sln| 45 -- src/log4net.vs2012.csproj | 808 - src/log4net.vs2012.sln| 45 -- tests/src/log4net.Tests.csproj| 263 ++ tests/src/log4net.Tests.vs2003.csproj | 293 --- tests/src/log4net.Tests.vs2008.csproj | 224 tests/src/log4net.Tests.vs2010.csproj | 257 - tests/src/log4net.Tests.vs2012.csproj | 263 -- 13 files changed, 1116 insertions(+), 3563 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f5fdf89f/src/log4net.csproj -- diff --git a/src/log4net.csproj b/src/log4net.csproj new file mode 100644 index 000..05a7062 --- /dev/null +++ b/src/log4net.csproj @@ -0,0 +1,808 @@ + + +http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> + +Local +9.0.30729 +2.0 +{181FE707-E161-4722-9F38-6AAAB6FAA106} +Debug +AnyCPU + + + + +log4net + + +JScript +Grid +IE50 +false +Library +log4net + + + + + + +3.5 +v4.5 +publish\ +true +Disk +false +Foreground +7 +Days +false +false +true +0 +1.0.0.%2a +false +false +true + + + +..\build\bin\net\4.5\debug\ +false +285212672 +false + + +TRACE;DEBUG;NET;NET_2_0;NET_4_0;NET_4_5 +log4net.xml +true +4096 +false +false +false +false +4 +full +prompt +SecurityRules.ruleset + + +..\build\bin\net\4.5\release\ +false +285212672 +false + + +TRACE;STRONG;NET;NET_2_0;NET_4_0;NET_4_5 +log4net.xml +false +4096 +true +false +false +false +4 +none +prompt +AllRules.ruleset + + + + System + + + + System.Data + + + System.Web + + + System.XML + + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + Code + + +
[3/3] logging-log4net git commit: Removed historical solutions and csproj files
Removed historical solutions and csproj files We decided that from now on we are going to maintain only one solution file and when someone would want to migrate to a new visual studio version a lazy vote should be started. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f5fdf89f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f5fdf89f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f5fdf89f Branch: refs/heads/master Commit: f5fdf89fdfb27ea76a500f962690b14eafadcac2 Parents: e9a9bb6 Author: Dominik Psenner Authored: Mon May 22 21:36:12 2017 +0200 Committer: Dominik Psenner Committed: Mon May 22 22:31:53 2017 +0200 -- src/log4net.csproj| 808 + src/log4net.sln | 45 ++ src/log4net.vs2008.csproj | 775 --- src/log4net.vs2008.sln| 45 -- src/log4net.vs2010.csproj | 808 - src/log4net.vs2010.sln| 45 -- src/log4net.vs2012.csproj | 808 - src/log4net.vs2012.sln| 45 -- tests/src/log4net.Tests.csproj| 263 ++ tests/src/log4net.Tests.vs2003.csproj | 293 --- tests/src/log4net.Tests.vs2008.csproj | 224 tests/src/log4net.Tests.vs2010.csproj | 257 - tests/src/log4net.Tests.vs2012.csproj | 263 -- 13 files changed, 1116 insertions(+), 3563 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f5fdf89f/src/log4net.csproj -- diff --git a/src/log4net.csproj b/src/log4net.csproj new file mode 100644 index 000..05a7062 --- /dev/null +++ b/src/log4net.csproj @@ -0,0 +1,808 @@ + + +http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> + +Local +9.0.30729 +2.0 +{181FE707-E161-4722-9F38-6AAAB6FAA106} +Debug +AnyCPU + + + + +log4net + + +JScript +Grid +IE50 +false +Library +log4net + + + + + + +3.5 +v4.5 +publish\ +true +Disk +false +Foreground +7 +Days +false +false +true +0 +1.0.0.%2a +false +false +true + + + +..\build\bin\net\4.5\debug\ +false +285212672 +false + + +TRACE;DEBUG;NET;NET_2_0;NET_4_0;NET_4_5 +log4net.xml +true +4096 +false +false +false +false +4 +full +prompt +SecurityRules.ruleset + + +..\build\bin\net\4.5\release\ +false +285212672 +false + + +TRACE;STRONG;NET;NET_2_0;NET_4_0;NET_4_5 +log4net.xml +false +4096 +true +false +false +false +4 +none +prompt +AllRules.ruleset + + + + System + + + + System.Data + + + System.Web + + + System.XML + + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + Code + + + Code + + +
[1/3] logging-log4net git commit: Removed historical solutions and csproj files
Repository: logging-log4net Updated Branches: refs/heads/master e9a9bb6bb -> f5fdf89fd http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f5fdf89f/tests/src/log4net.Tests.vs2008.csproj -- diff --git a/tests/src/log4net.Tests.vs2008.csproj b/tests/src/log4net.Tests.vs2008.csproj deleted file mode 100644 index 5bbb7c9..000 --- a/tests/src/log4net.Tests.vs2008.csproj +++ /dev/null @@ -1,224 +0,0 @@ - - - -http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> - -Local -9.0.30729 -2.0 -{B0530F10-0238-49A9-93B0-8EF412E90BCF} -Debug -AnyCPU - - - - -log4net.Tests - - -JScript -Grid -IE50 -false -Library -log4net.Tests - - - - - - -2.0 -v3.5 - - -..\bin\Debug\ -false -285212672 -false - - -TRACE;DEBUG;NET_2_0 - - -true -4096 -false -false -false -false -4 -full -prompt - - -..\bin\Release\ -false -285212672 -false - - -TRACE - - -false -4096 -true -false -false -false -4 -none -prompt - - - - False - ..\..\..\ibatisnet-3\External-Bin\Net\2.0\nunit.framework.dll - - - System - - - - 3.5 - - - System.Data - - - System.Runtime.Remoting - - - System.XML - - - - - AssemblyVersionInfo.cs - Code - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - - - Code - - - Code - - - - - - - Code - - - Code - - - Code - - - Code - - - - - {181FE707-E161-4722-9F38-6AAAB6FAA106} - log4net.vs2008 - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f5fdf89f/tests/src/log4net.Tests.vs2010.csproj -- diff --git a/tests/src/log4net.Tests.vs2010.csproj b/tests/src/log4net.Tests.vs2010.csproj deleted file mode 100644 index 407fc68..000 --- a/tests/src/log4net.Tests.vs2010.csproj +++ /dev/null @@ -1,257 +0,0 @@ - - -http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> - -Local -9.0.30729 -2.0 -{B0530F10-0238-49A9-93B0-8EF412E90BCF} -Debug -AnyCPU - - - - -log4net.Tests - - -JScript -Grid -IE50 -false -Library -log4net.Tests - - - - - - -3.5 -v4.0 -publish\ -true -Disk -false -Foreground -7 -Days -false -false -true -0 -1.0.0.%2a -false -false -true - - - -..\bin\Debug\ -false -285212672 -false - - -TRACE;DEBUG;NET;NET_2_0;NET_4_0 - - -true -4096 -false -false -false -false -4 -full -prompt -AllRules.ruleset - - -..\bin\Release\ -false -285212672 -false - - -TRACE;NET;NET_2_0;NET_4_0 - - -false -4096 -true -false -false -false -4 -none -prompt -AllRules.ruleset - - - - False - ..\..\..\ibatisnet-3\External-Bin\Net\2.0\nunit.framework.dll - - - System - - - - 3.5 - - - System.Data - - - System.Runtime.Remoting - - - System.XML - - - - - AssemblyVersionInfo.cs - Code - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - - Code - - - Code - - - - - Code - - - Code - - - - - - - Code - - - Code - - - Code - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False -
[2/3] logging-log4net git commit: Removed historical solutions and csproj files
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f5fdf89f/src/log4net.vs2010.csproj -- diff --git a/src/log4net.vs2010.csproj b/src/log4net.vs2010.csproj deleted file mode 100644 index 7865f1e..000 --- a/src/log4net.vs2010.csproj +++ /dev/null @@ -1,808 +0,0 @@ - - -http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> - -Local -9.0.30729 -2.0 -{181FE707-E161-4722-9F38-6AAAB6FAA106} -Debug -AnyCPU - - - - -log4net - - -JScript -Grid -IE50 -false -Library -log4net - - - - - - -3.5 -v4.0 -publish\ -true -Disk -false -Foreground -7 -Days -false -false -true -0 -1.0.0.%2a -false -false -true - - - -..\build\bin\net\4.0\debug\ -false -285212672 -false - - -TRACE;DEBUG;NET;NET_2_0;NET_4_0 -log4net.xml -true -4096 -false -false -false -false -4 -full -prompt -SecurityRules.ruleset - - -..\build\bin\net\4.0\release\ -false -285212672 -false - - -TRACE;STRONG;NET;NET_2_0;NET_4_0 -log4net.xml -false -4096 -true -false -false -false -4 -none -prompt -AllRules.ruleset - - - - System - - - - System.Data - - - System.Web - - - System.XML - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code -
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/2.0.8 [deleted] cd20f62a7
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/2.0.6 [deleted] 5059de001
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/2.0.7 [deleted] e0ba3317f
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.15 [deleted] 6151e7f73
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.14 [deleted] 213971142
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.13 [deleted] d52532cb7
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.12 [deleted] 03f60f6c1
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.11 [deleted] 957ba3692
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.10 [deleted] d61392a3d
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.9 [deleted] 18a96716a
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/rc/1.2.10-RC2 [created] 683c1c7d3 refs/tags/rc/1.2.11-RC1 [created] 36cb67d5a refs/tags/rc/1.2.12-RC1 [created] 177a6a4ee refs/tags/rc/1.2.13-RC1 [created] 01b46ec00 refs/tags/rc/1.2.13-RC2 [created] 695b06d51 refs/tags/rc/1.2.13-RC3 [created] 192968847 refs/tags/rc/1.2.14-RC1 [created] 63b3e3be4 refs/tags/rc/1.2.14-RC2 [created] d1f916a40 refs/tags/rc/1.2.15-RC1 [created] c2cd9df3e refs/tags/rc/2.0.6-RC1 [created] 818162016 refs/tags/rc/2.0.7-RC1 [created] 5d8e8f002 refs/tags/rc/2.0.8-RC1 [created] 0aecd56e9
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.10-RC2 [deleted] a8ca21fe2
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.11-RC1 [deleted] b067cc41c
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.12-RC1 [deleted] ed8c85bc1
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.13-RC1 [deleted] 91c7447bb
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.13-RC2 [deleted] ea3206457
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.13-RC3 [deleted] 44fff1715
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.14-RC1 [deleted] ffc247522
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.14-RC2 [deleted] 5e045da83
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.15-RC1 [deleted] 7ae407601
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/2.0.6-RC1 [deleted] 21f14dcad
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/2.0.7-RC1 [deleted] 1ebdafb1a
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/2.0.8-RC1 [deleted] 9faf43420
[3/4] logging-log4net git commit: Support for types of non-parameterless constructors in XmlConfigurator.
Support for types of non-parameterless constructors in XmlConfigurator. The constructor parameters are taken from the corresponding values of the child nodes. You can add for instance where StandardUnit has only one constructor that has a string parameter named "value". Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/b4bc43ee Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/b4bc43ee Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/b4bc43ee Branch: refs/heads/pr/old/10 Commit: b4bc43eed24d1152772141652d68002f396c615d Parents: 610157a Author: Martin Camitz Authored: Tue Apr 22 15:36:29 2014 +0200 Committer: Dominik Psenner Committed: Thu May 25 00:06:48 2017 +0200 -- .../Hierarchy/XmlHierarchyConfigurator.cs | 54 ++-- 1 file changed, 50 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b4bc43ee/src/log4net/Repository/Hierarchy/XmlHierarchyConfigurator.cs -- diff --git a/src/log4net/Repository/Hierarchy/XmlHierarchyConfigurator.cs b/src/log4net/Repository/Hierarchy/XmlHierarchyConfigurator.cs index ae415d7..a251b47 100644 --- a/src/log4net/Repository/Hierarchy/XmlHierarchyConfigurator.cs +++ b/src/log4net/Repository/Hierarchy/XmlHierarchyConfigurator.cs @@ -19,7 +19,9 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Globalization; +using System.Linq; using System.Reflection; using System.Xml; @@ -986,13 +988,57 @@ namespace log4net.Repository.Hierarchy // Create using the default constructor object createdObject = null; - try + + //Try parameterless constructor + if (objectType.GetConstructor(Type.EmptyTypes) != null) { - createdObject = Activator.CreateInstance(objectType); + try + { + createdObject = Activator.CreateInstance(objectType); + } + catch (Exception createInstanceEx) + { + LogLog.Error(declaringType, + "XmlHierarchyConfigurator: Failed to construct object of type [" + objectType.FullName + + "] Exception: " + createInstanceEx.ToString()); + } + } - catch(Exception createInstanceEx) + else { - LogLog.Error(declaringType, "XmlHierarchyConfigurator: Failed to construct object of type [" + objectType.FullName + "] Exception: "+createInstanceEx.ToString()); + //See if there is a constructor matching supplied values, most specific first. + Exception lastException = null; + foreach (var constructorInfo in objectType.GetConstructors().OrderByDescending(x => x.GetParameters().Count())) + { + + try + { + var nodes = new List(element.ChildNodes.Cast()); + var parameterInfos = constructorInfo.GetParameters(); + LogLog.Debug(declaringType, "Trying constructor with parameters: " + string.Join(",", parameterInfos.Select(p => p.Name))); + + var args = parameterInfos.Select(p => nodes.SingleOrDefault(n => n.Name == p.Name)); + LogLog.Debug(declaringType, "Matching args from config: " + string.Join(",", args.Select(n => n.Name))); + LogLog.Debug(declaringType, "Matching arg values from config: " + string.Join(",", args.Select(a => a.Attributes["value"].Value))); + if (args.All(a => a != null)) + { + createdObject = constructorInfo.Invoke(args.Select(a => a.Attributes["value"].Value).ToArray()); + break; + } + } + catch (Exception e) +
[4/4] logging-log4net git commit: Only look at relevant log files for backup size at initialization time.
Only look at relevant log files for backup size at initialization time. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/675e7cba Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/675e7cba Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/675e7cba Branch: refs/heads/pr/old/22 Commit: 675e7cba232433f99e3ab0800e59c6740d6ecb37 Parents: 655233d Author: Sotirios Delimanolis Authored: Fri Jan 29 10:06:25 2016 -0800 Committer: Dominik Psenner Committed: Thu May 25 23:16:48 2017 +0200 -- src/Appender/RollingFileAppender.cs | 149 +-- 1 file changed, 62 insertions(+), 87 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/675e7cba/src/Appender/RollingFileAppender.cs -- diff --git a/src/Appender/RollingFileAppender.cs b/src/Appender/RollingFileAppender.cs index c1b7705..3068ce7 100644 --- a/src/Appender/RollingFileAppender.cs +++ b/src/Appender/RollingFileAppender.cs @@ -867,100 +867,75 @@ namespace log4net.Appender } } - /// - /// Does the work of bumping the 'current' file counter higher - /// to the highest count when an incremental file name is seen. - /// The highest count is either the first file (when count direction - /// is greater than 0) or the last file (when count direction less than 0). - /// In either case, we want to know the highest count that is present. - /// - /// - /// - private void InitializeFromOneFile(string baseFile, string curFileName) - { -if (curFileName.StartsWith(Path.GetFileNameWithoutExtension(baseFile)) == false) - { - // This is not a log file, so ignore - return; - } - if (curFileName.Equals(baseFile)) - { - // Base log file is not an incremented logfile (.1 or .2, etc) - return; - } - -/* - if (m_staticLogFileName) - { - int endLength = curFileName.Length - index; - if (baseFile.Length + endLength != curFileName.Length) - { - // file is probably scheduledFilename + .x so I don't care - return; - } - } -*/ - - // Only look for files in the current roll point - if (m_rollDate && !m_staticLogFileName) - { - string date = m_dateTime.Now.ToString(m_datePattern, System.Globalization.DateTimeFormatInfo.InvariantInfo); - string prefix = m_preserveLogFileNameExtension ? Path.GetFileNameWithoutExtension(baseFile) + date : baseFile + date; - string suffix = m_preserveLogFileNameExtension ? Path.GetExtension(baseFile) : ""; - if (!curFileName.StartsWith(prefix) || !curFileName.EndsWith(suffix)) - { - LogLog.Debug(declaringType, "Ignoring file ["+curFileName+"] because it is from a different date period"); - return; - } - } - - try - { - // Bump the counter up to the highest count seen so far -int backup = GetBackUpIndex(curFileName); - -// caution: we might get a false positive when certain -// date patterns such as MMdd are used...those are -// valid number but aren't the kind of back up index -// we're looking for -if (backup > m_curSizeRollBackups) -{ -if (0 == m_maxSizeRollBackups) -{ -// Stay at zero when zero backups are desired -} -else if (-1 == m_maxSizeRollBackups) -{ -// Infinite backups, so go as high as the highest value -m_curSizeRollBackups = backup; +/// +/// Does the work of bumping the 'current' file counter hi
[2/4] logging-log4net git commit: add ColoredSmtpAppender. allow user send colorful log email.
add ColoredSmtpAppender. allow user send colorful log email. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/3c930d8d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/3c930d8d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/3c930d8d Branch: refs/heads/pr/old/7 Commit: 3c930d8d9b35cbfe1ba3e7ad93ff888d71f94f01 Parents: b584368 Author: Devin Authored: Fri Dec 13 09:35:41 2013 -0800 Committer: Dominik Psenner Committed: Wed May 24 23:26:39 2017 +0200 -- src/log4net/Appender/ColoredSmtpAppender.cs | 315 +++ src/log4net/log4net.vs2010.csproj | 7 +- 2 files changed, 320 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/3c930d8d/src/log4net/Appender/ColoredSmtpAppender.cs -- diff --git a/src/log4net/Appender/ColoredSmtpAppender.cs b/src/log4net/Appender/ColoredSmtpAppender.cs new file mode 100644 index 000..d9a8573 --- /dev/null +++ b/src/log4net/Appender/ColoredSmtpAppender.cs @@ -0,0 +1,315 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Net.Mail; +using System.Text; +using System.Web; +using log4net.Appender; +using log4net.Core; +using log4net.Util; + +namespace log4net.Appender +{ +/// +/// Appends colorful logging events to the email html content +/// +/// +/// +/// When configuring the colored console appender, mappings should be +/// specified to map logging levels to colors and css styles. For example: +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// The Level is the standard log4net logging level while +/// ForeColor and BackColor are the values of CSS color value +/// Style is the CSS style. +/// +/// +/// Devin Zeng +public class ColoredSmtpAppender : SmtpAppender +{ +private LevelMapping m_levelMapping = new LevelMapping(); + +protected override void SendBuffer(LoggingEvent[] events) +{ +// Note: this code already owns the monitor for this +// appender. This frees us from needing to synchronize again. +try +{ +StringWriter writer = new StringWriter(System.Globalization.CultureInfo.InvariantCulture); + +string t = Layout.Header; +if (t != null) +{ +writer.Write(t); +} + +for (int i = 0; i < events.Length; i++) +{ +// Render the event and append the text to the buffer +RenderColoredLoggingEvent(writer, events[i]); +} + +t = Layout.Footer; +if (t != null) +{ +writer.Write(t); +} + +SendEmail(writer.ToString()); +} +catch (Exception e) +{ +ErrorHandler.Error("Error occurred while sending e-mail notification.", e); +} +} +/// +/// Based on loggingEvent configration, render the html formatted log content. +/// +/// +/// +protected void RenderColoredLoggingEvent(TextWriter writer, LoggingEvent loggingEvent) +{ +if (Layout == null) +{ +throw new InvalidOperationException("A layout must be set"); +} +if (Layout.IgnoresException) +{ +string exceptionStr = loggingEvent.GetExceptionString(); +if (exceptionStr != null && exceptionStr.Length > 0) +{ +writer.WriteLine(HtmlMessage(exceptionStr)); +} +} +writer.WriteLine(BuildHtmlLoggingMessage(loggingEvent)); + +} +/// +/// Build loggingEvent html format message +/// +/// +/// Log content +private string BuildHtmlLoggingMessage(LoggingEvent loggingEvent) +{ +StringBuilder style = new StringBuilder(); +LevelColors levelColors = m_levelMapping.Lookup(loggingEvent.Level) as LevelColors; +if (levelColors != null) +{ +// if the backColor has been explicitly set +
[1/4] logging-log4net git commit: First version of ProcMonAppender
Repository: logging-log4net Updated Branches: refs/heads/develop [created] f5fdf89fd refs/heads/pr/old/10 [created] b4bc43eed refs/heads/pr/old/22 [created] 675e7cba2 refs/heads/pr/old/7 [created] 3c930d8d9 refs/heads/pr/old/9 [created] f33118151 Updated Tags: refs/tags/1.2.13RC1 [created] 6dc3da926 First version of ProcMonAppender Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f3311815 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f3311815 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f3311815 Branch: refs/heads/pr/old/9 Commit: f331181519b36aebf9203bead1cce6e57c58b373 Parents: 610157a Author: Justin Dearing Authored: Thu Mar 20 19:12:19 2014 -0400 Committer: Dominik Psenner Committed: Wed May 24 23:25:47 2017 +0200 -- src/log4net/Appender/ProcMonAppender.cs | 170 +++ src/log4net/log4net.vs2010.csproj | 5 +- 2 files changed, 173 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f3311815/src/log4net/Appender/ProcMonAppender.cs -- diff --git a/src/log4net/Appender/ProcMonAppender.cs b/src/log4net/Appender/ProcMonAppender.cs new file mode 100644 index 000..cfd8af6 --- /dev/null +++ b/src/log4net/Appender/ProcMonAppender.cs @@ -0,0 +1,170 @@ +#region Apache License +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to you under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#endregion + +using System; +using System.Diagnostics; +using System.Runtime.InteropServices; +using System.Text; +using log4net.Core; +using Microsoft.Win32.SafeHandles; + +namespace log4net.Appender +{ +/// +/// Appends log events to Sysinternals Process Monitor. +/// +/// +/// +/// The application configuration file can be used to control what listeners +/// are actually used. +/// +/// +/// Events are written using a write only file handle that procmon listens for. Process Monitor will then display these messages amongst the IO data. +/// +/// +/// Justin Dearing +/// http://www.wintellect.com/blogs/jrobbins/see-the-i-o-you-caused-by-getting-your-diagnostic-tracing-into-process-monitor"/> +/// http://www.wintellect.com/blogs/jrobbins/procmondebugoutput-now-on-github"/> +/// https://github.com/Wintellect/ProcMonDebugOutput"/> +public class ProcMonAppender : AppenderSkeleton +{ +// Constants to represent C preprocessor macros for PInvokes +const uint GENERIC_WRITE = 0x4000; +const uint OPEN_EXISTING = 3; +const uint FILE_WRITE_ACCESS = 0x0002; +const uint FILE_SHARE_WRITE = 0x0002; +const uint FILE_ATTRIBUTE_NORMAL = 0x0080; +const uint METHOD_BUFFERED = 0; + +// Procmon Constants +const uint FILE_DEVICE_PROCMON_LOG = 0x9535; +const string PROCMON_DEBUGGER_HANDLER = ".\\Global\\ProcmonDebugLogger"; + +/// +/// The handle to the procmon log device. +/// +private static SafeFileHandle hProcMon; + +/// +/// Get the IO Control code for the ProcMon log. +/// +private static uint IOCTL_EXTERNAL_LOG_DEBUGOUT { get { return CTL_CODE(); } } + +/// http://msdn.microsoft.com/en-us/library/windows/hardware/ff543023(v=vs.85).aspx"/> +private static uint CTL_CODE( +uint DeviceType = FILE_DEVICE_PROCMON_LOG, +uint Function = 0x81, +uint Method = METHOD_BUFFERED, +uint Access = FILE_WRITE_ACCESS) +{ +return ((DeviceType << 16) | (Access << 14) | (Function << 2) | Method); +} + +/// This is only used for opening the procmon log handle, hence the default parameters. +/// http://msdn.microsoft.com/en-us/library/windows/desktop/aa363858(v=vs.85).aspx"/> +[DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)] +private static extern SafeFileHandl
logging-log4net git commit: Removed the event properties in CreateCompositeProperties
Repository: logging-log4net Updated Branches: refs/heads/pr/old/28 [created] fc5e1bbba Removed the event properties in CreateCompositeProperties In order to increase the speed up operations in almost x10 times of using properties in the output when UserName and Identity information are not needed. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/fc5e1bbb Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/fc5e1bbb Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/fc5e1bbb Branch: refs/heads/pr/old/28 Commit: fc5e1bbbacaf121628cdce7d7cf5e5d094fca365 Parents: 563311c Author: Sergii Kolbasin Authored: Mon Jun 27 16:17:11 2016 +0200 Committer: Dominik Psenner Committed: Thu May 25 23:19:23 2017 +0200 -- src/Core/LoggingEvent.cs | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/fc5e1bbb/src/Core/LoggingEvent.cs -- diff --git a/src/Core/LoggingEvent.cs b/src/Core/LoggingEvent.cs index 787aa84..cae59fe 100644 --- a/src/Core/LoggingEvent.cs +++ b/src/Core/LoggingEvent.cs @@ -1335,11 +1335,15 @@ namespace log4net.Core // TODO: Add Repository Properties - // event properties + /* Event properties. PERFORMANCE ISSUE: + * The "LoggingEvent" object has this options and we are able to include them using Layout if needed. + * Initializing the "UserName" and "Identity" properties are quite expensive time cost operations. + * So please do not need to duplicate the data in the properties if no needed in order to be fast as possible. PropertiesDictionary eventProperties = new PropertiesDictionary(); eventProperties[UserNameProperty] = UserName; eventProperties[IdentityProperty] = Identity; m_compositeProperties.Add(eventProperties); + */ m_compositeProperties.Add(GlobalContext.Properties.GetReadOnlyProperties()); }
[logging-log4net] Git Push Summary
Repository: logging-log4net Updated Tags: refs/tags/1.2.13RC1 [deleted] 6dc3da926
svn commit: r1364911 - /logging/log4net/trunk/src/Layout/Pattern/StackTracePatternConverter.cs
Author: dpsenner Date: Tue Jul 24 06:26:48 2012 New Revision: 1364911 URL: http://svn.apache.org/viewvc?rev=1364911&view=rev Log: LOG4NET-348 fix System.IndexOutOfRangeException in StackTracePatternConverter whenever m_stackFrameLevel is bigger than the retrieved StackFrames Modified: logging/log4net/trunk/src/Layout/Pattern/StackTracePatternConverter.cs Modified: logging/log4net/trunk/src/Layout/Pattern/StackTracePatternConverter.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/Pattern/StackTracePatternConverter.cs?rev=1364911&r1=1364910&r2=1364911&view=diff == --- logging/log4net/trunk/src/Layout/Pattern/StackTracePatternConverter.cs (original) +++ logging/log4net/trunk/src/Layout/Pattern/StackTracePatternConverter.cs Tue Jul 24 06:26:48 2012 @@ -105,7 +105,7 @@ namespace log4net.Layout.Pattern int stackFrameIndex = m_stackFrameLevel - 1; while (stackFrameIndex >= 0) { - if (stackFrameIndex > stackframes.Length) + if (stackFrameIndex >= stackframes.Length) { stackFrameIndex--; continue; @@ -147,4 +147,4 @@ namespace log4net.Layout.Pattern #endregion Private Static Fields } } -#endif \ No newline at end of file +#endif
svn commit: r1380139 [1/3] - in /logging/log4net/trunk: extensions/net/1.0/log4net.Ext.EventID/cs/src/ extensions/net/1.0/log4net.Ext.MarshalByRef/cs/src/ extensions/net/1.0/log4net.Ext.Trace/cs/src/
Author: dpsenner Date: Mon Sep 3 06:52:19 2012 New Revision: 1380139 URL: http://svn.apache.org/viewvc?rev=1380139&view=rev Log: LOG4NET-352 fix documentation cref IDs to resolve ambiguous references log4net should compile on Mono >2.6 from now on. Modified: logging/log4net/trunk/extensions/net/1.0/log4net.Ext.EventID/cs/src/EventIDLogManager.cs logging/log4net/trunk/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/src/MarshalByRefLogManager.cs logging/log4net/trunk/extensions/net/1.0/log4net.Ext.Trace/cs/src/TraceLogManager.cs logging/log4net/trunk/src/Appender/AnsiColorTerminalAppender.cs logging/log4net/trunk/src/Appender/AppenderSkeleton.cs logging/log4net/trunk/src/Appender/AspNetTraceAppender.cs logging/log4net/trunk/src/Appender/BufferingAppenderSkeleton.cs logging/log4net/trunk/src/Appender/ColoredConsoleAppender.cs logging/log4net/trunk/src/Appender/ConsoleAppender.cs logging/log4net/trunk/src/Appender/DebugAppender.cs logging/log4net/trunk/src/Appender/EventLogAppender.cs logging/log4net/trunk/src/Appender/FileAppender.cs logging/log4net/trunk/src/Appender/IAppender.cs logging/log4net/trunk/src/Appender/LocalSyslogAppender.cs logging/log4net/trunk/src/Appender/ManagedColoredConsoleAppender.cs logging/log4net/trunk/src/Appender/MemoryAppender.cs logging/log4net/trunk/src/Appender/NetSendAppender.cs logging/log4net/trunk/src/Appender/RemoteSyslogAppender.cs logging/log4net/trunk/src/Appender/TextWriterAppender.cs logging/log4net/trunk/src/Appender/UdpAppender.cs logging/log4net/trunk/src/Config/BasicConfigurator.cs logging/log4net/trunk/src/Config/DOMConfigurator.cs logging/log4net/trunk/src/Config/DOMConfiguratorAttribute.cs logging/log4net/trunk/src/Config/PluginAttribute.cs logging/log4net/trunk/src/Config/SecurityContextProviderAttribute.cs logging/log4net/trunk/src/Config/XmlConfigurator.cs logging/log4net/trunk/src/Config/XmlConfiguratorAttribute.cs logging/log4net/trunk/src/Core/CompactRepositorySelector.cs logging/log4net/trunk/src/Core/DefaultRepositorySelector.cs logging/log4net/trunk/src/Core/ErrorCode.cs logging/log4net/trunk/src/Core/ExceptionEvaluator.cs logging/log4net/trunk/src/Core/IErrorHandler.cs logging/log4net/trunk/src/Core/IRepositorySelector.cs logging/log4net/trunk/src/Core/LevelEvaluator.cs logging/log4net/trunk/src/Core/LevelMap.cs logging/log4net/trunk/src/Core/LogImpl.cs logging/log4net/trunk/src/Core/LoggerManager.cs logging/log4net/trunk/src/Core/LoggingEvent.cs logging/log4net/trunk/src/DateFormatter/SimpleDateFormatter.cs logging/log4net/trunk/src/Filter/LoggerMatchFilter.cs logging/log4net/trunk/src/ILog.cs logging/log4net/trunk/src/Layout/ExceptionLayout.cs logging/log4net/trunk/src/Layout/ILayout.cs logging/log4net/trunk/src/Layout/LayoutSkeleton.cs logging/log4net/trunk/src/Layout/Pattern/DatePatternConverter.cs logging/log4net/trunk/src/Layout/PatternLayout.cs logging/log4net/trunk/src/LogManager.cs logging/log4net/trunk/src/ObjectRenderer/DefaultRenderer.cs logging/log4net/trunk/src/ObjectRenderer/IObjectRenderer.cs logging/log4net/trunk/src/ObjectRenderer/RendererMap.cs logging/log4net/trunk/src/Plugin/RemoteLoggingServerPlugin.cs logging/log4net/trunk/src/Repository/Hierarchy/Hierarchy.cs logging/log4net/trunk/src/Repository/ILoggerRepository.cs logging/log4net/trunk/src/Repository/LoggerRepositorySkeleton.cs logging/log4net/trunk/src/Util/NativeError.cs logging/log4net/trunk/src/Util/PatternString.cs logging/log4net/trunk/src/Util/PatternStringConverters/DatePatternConverter.cs logging/log4net/trunk/src/Util/SystemInfo.cs logging/log4net/trunk/src/Util/TypeConverters/ConverterRegistry.cs logging/log4net/trunk/src/Util/TypeConverters/EncodingConverter.cs logging/log4net/trunk/src/Util/TypeConverters/PatternStringConverter.cs logging/log4net/trunk/src/Util/TypeConverters/TypeConverter.cs Modified: logging/log4net/trunk/extensions/net/1.0/log4net.Ext.EventID/cs/src/EventIDLogManager.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/extensions/net/1.0/log4net.Ext.EventID/cs/src/EventIDLogManager.cs?rev=1380139&r1=1380138&r2=1380139&view=diff == --- logging/log4net/trunk/extensions/net/1.0/log4net.Ext.EventID/cs/src/EventIDLogManager.cs (original) +++ logging/log4net/trunk/extensions/net/1.0/log4net.Ext.EventID/cs/src/EventIDLogManager.cs Mon Sep 3 06:52:19 2012 @@ -201,7 +201,7 @@ namespace log4net.Ext.EventID } /// - /// Shorthand for . + /// Shorthand for . /// /// /// Get the logger for the fully qualified name of the type specified. @@ -215,7 +215,7 @@ namespace
svn commit: r1380139 [3/3] - in /logging/log4net/trunk: extensions/net/1.0/log4net.Ext.EventID/cs/src/ extensions/net/1.0/log4net.Ext.MarshalByRef/cs/src/ extensions/net/1.0/log4net.Ext.Trace/cs/src/
Modified: logging/log4net/trunk/src/LogManager.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/LogManager.cs?rev=1380139&r1=1380138&r2=1380139&view=diff == --- logging/log4net/trunk/src/LogManager.cs (original) +++ logging/log4net/trunk/src/LogManager.cs Mon Sep 3 06:52:19 2012 @@ -31,7 +31,7 @@ namespace log4net /// /// /// This class has static methods that are used by a client to request - /// a logger instance. The method is + /// a logger instance. The method is /// used to retrieve a logger. /// /// @@ -243,7 +243,7 @@ namespace log4net } /// - /// Shorthand for . + /// Shorthand for . /// /// /// Get the logger for the fully qualified name of the type specified. @@ -256,7 +256,7 @@ namespace log4net } /// - /// Shorthand for . + /// Shorthand for . /// /// /// Gets the logger for the fully qualified name of the type specified. @@ -270,7 +270,7 @@ namespace log4net } /// - /// Shorthand for . + /// Shorthand for . /// /// /// Gets the logger for the fully qualified name of the type specified. @@ -451,7 +451,7 @@ namespace log4net /// /// /// Gets the for the repository specified - /// by the callers assembly (). + /// by the callers assembly (). /// /// /// The instance for the default repository. @@ -502,7 +502,7 @@ namespace log4net /// /// /// Gets the for the repository specified - /// by the callers assembly (). + /// by the callers assembly (). /// /// /// The instance for the default repository. @@ -553,7 +553,7 @@ namespace log4net /// /// /// The created will be associated with the repository - /// specified such that a call to will return + /// specified such that a call to will return /// the same repository instance. /// /// @@ -578,7 +578,7 @@ namespace log4net /// /// /// The created will be associated with the repository - /// specified such that a call to will return + /// specified such that a call to will return /// the same repository instance. /// /// @@ -686,7 +686,7 @@ namespace log4net /// /// /// The created will be associated with the repository - /// specified such that a call to with the + /// specified such that a call to with the /// same assembly specified will return the same repository instance. /// /// @@ -707,7 +707,7 @@ namespace log4net /// /// /// The created will be associated with the repository - /// specified such that a call to with the + /// specified such that a call to with the /// same assembly specified will return the same repository instance. /// /// Modified: logging/log4net/trunk/src/ObjectRenderer/DefaultRenderer.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/ObjectRenderer/DefaultRenderer.cs?rev=1380139&r1=1380138&r2=1380139&view=diff == --- logging/log4net/trunk/src/ObjectRenderer/DefaultRenderer.cs (original) +++ logging/log4net/trunk/src/ObjectRenderer/DefaultRenderer.cs Mon Sep 3 06:52:19 2012 @@ -73,7 +73,7 @@ namespace log4net.ObjectRenderer /// The parameter is /// provided to lookup and render other objects. This is /// very useful where contains - /// nested objects of unknown type. The + /// nested objects of unknown type. The /// method can be used to render these objects. /// /// Modified: logging/log4net/trunk/src/ObjectRenderer/IObjectRenderer.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/ObjectRenderer/IObjectRenderer.cs?rev=1380139&r1=1380138&r2=1380139&view=diff == --- logging/log4net/trunk/src/ObjectRenderer/IObjectRenderer.cs (ori
svn commit: r1408260 - /logging/log4net/trunk/src/Util/SystemInfo.cs
Author: dpsenner Date: Mon Nov 12 12:03:14 2012 New Revision: 1408260 URL: http://svn.apache.org/viewvc?rev=1408260&view=rev Log: LOG4NET-362 fix SystemInfo.AssemblyLocationInfo that raises an unhandled ArgumentException when the application is started via UNC path Modified: logging/log4net/trunk/src/Util/SystemInfo.cs Modified: logging/log4net/trunk/src/Util/SystemInfo.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/SystemInfo.cs?rev=1408260&r1=1408259&r2=1408260&view=diff == --- logging/log4net/trunk/src/Util/SystemInfo.cs (original) +++ logging/log4net/trunk/src/Util/SystemInfo.cs Mon Nov 12 12:03:14 2012 @@ -455,7 +455,11 @@ namespace log4net.Util // carry on. return myAssembly.Location; } - catch(System.Security.SecurityException) + catch (ArgumentException ex) + { + return "Location Detect Failed (" + ex.Message + ")"; + } + catch (System.Security.SecurityException) { return "Location Permission Denied"; }
svn commit: r1414160 - /logging/log4net/trunk/src/site/xdoc/release/faq.xml
Author: dpsenner Date: Tue Nov 27 12:49:22 2012 New Revision: 1414160 URL: http://svn.apache.org/viewvc?rev=1414160&view=rev Log: LOG4NET-178 added FAQ entry that describes why LOG4NET could stop logging when deployed as a ASP.NET web application Modified: logging/log4net/trunk/src/site/xdoc/release/faq.xml Modified: logging/log4net/trunk/src/site/xdoc/release/faq.xml URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/release/faq.xml?rev=1414160&r1=1414159&r2=1414160&view=diff == --- logging/log4net/trunk/src/site/xdoc/release/faq.xml (original) +++ logging/log4net/trunk/src/site/xdoc/release/faq.xml Tue Nov 27 12:49:22 2012 @@ -1038,6 +1038,33 @@ public class FastLogger Back to Top + + + + +This problem has been reported by several people as issue +https://issues.apache.org/jira/browse/LOG4NET-178";>LOG4NET-178. +The issue seems to be caused by a broken LOG4NET configuration +or a timing problem caused by an application shutdown event that +floats in late after an application start event and thus LOG4NET +stops logging immediately after it has been started. + + +The first thing step to troubleshoot problems is enabling +the log4net internal debugging features as described +http://logging.apache.org/log4net/release/faq.html#internalDebug";>here +and fix all errors that pop up. If the problem still persists, +https://issues.apache.org/jira/browse/LOG4NET-178?focusedCommentId=13504094&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13504094";>this comment +suggests to move the LOG4NET configuration out of the +web.config into a separate file +like log4net.config. Finally, +if both previous steps did not help and the problem still +occurs, you can try to work around the event timing problem +by invoking the configuration call from the class constructor as described in +https://issues.apache.org/jira/browse/LOG4NET-178?focusedCommentId=13504485&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13504485";>this comment. + + +Back to Top
svn commit: r1414584 - /logging/log4net/trunk/src/site/xdoc/release/faq.xml
Author: dpsenner Date: Wed Nov 28 08:50:27 2012 New Revision: 1414584 URL: http://svn.apache.org/viewvc?rev=1414584&view=rev Log: LOG4NET-178 escape ampersands in the new FAQ entry links because they break the site build Modified: logging/log4net/trunk/src/site/xdoc/release/faq.xml Modified: logging/log4net/trunk/src/site/xdoc/release/faq.xml URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/release/faq.xml?rev=1414584&r1=1414583&r2=1414584&view=diff == --- logging/log4net/trunk/src/site/xdoc/release/faq.xml (original) +++ logging/log4net/trunk/src/site/xdoc/release/faq.xml Wed Nov 28 08:50:27 2012 @@ -1054,14 +1054,14 @@ public class FastLogger the log4net internal debugging features as described http://logging.apache.org/log4net/release/faq.html#internalDebug";>here and fix all errors that pop up. If the problem still persists, -https://issues.apache.org/jira/browse/LOG4NET-178?focusedCommentId=13504094&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13504094";>this comment +https://issues.apache.org/jira/browse/LOG4NET-178?focusedCommentId=13504094&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13504094";>this comment suggests to move the LOG4NET configuration out of the web.config into a separate file like log4net.config. Finally, if both previous steps did not help and the problem still occurs, you can try to work around the event timing problem by invoking the configuration call from the class constructor as described in -https://issues.apache.org/jira/browse/LOG4NET-178?focusedCommentId=13504485&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13504485";>this comment. +https://issues.apache.org/jira/browse/LOG4NET-178?focusedCommentId=13504485&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13504485";>this comment. Back to Top
svn commit: r1414633 - /logging/log4net/trunk/pom.xml
Author: dpsenner Date: Wed Nov 28 10:42:57 2012 New Revision: 1414633 URL: http://svn.apache.org/viewvc?rev=1414633&view=rev Log: Added dpsenner as developer Modified: logging/log4net/trunk/pom.xml Modified: logging/log4net/trunk/pom.xml URL: http://svn.apache.org/viewvc/logging/log4net/trunk/pom.xml?rev=1414633&r1=1414632&r2=1414633&view=diff == --- logging/log4net/trunk/pom.xml (original) +++ logging/log4net/trunk/pom.xml Wed Nov 28 10:42:57 2012 @@ -220,6 +220,10 @@ Ron Grabowski rgrabowski + + Dominik Psenner + dpsenner +
svn commit: r1416843 - /logging/log4net/trunk/src/Appender/EventLogAppender.cs
Author: dpsenner Date: Tue Dec 4 09:38:28 2012 New Revision: 1416843 URL: http://svn.apache.org/viewvc?rev=1416843&view=rev Log: LOG4NET-360 work around the event log restrictions for windows vista and newer to prevent event log corruption Modified: logging/log4net/trunk/src/Appender/EventLogAppender.cs Modified: logging/log4net/trunk/src/Appender/EventLogAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/EventLogAppender.cs?rev=1416843&r1=1416842&r2=1416843&view=diff == --- logging/log4net/trunk/src/Appender/EventLogAppender.cs (original) +++ logging/log4net/trunk/src/Appender/EventLogAppender.cs Tue Dec 4 09:38:28 2012 @@ -454,10 +454,10 @@ namespace log4net.Appender { string eventTxt = RenderLoggingEvent(loggingEvent); - // There is a limit of 32K characters for an event log message - if (eventTxt.Length > 32000) + // There is a limit of about 32K characters for an event log message + if (eventTxt.Length > MAX_EVENTLOG_MESSAGE_SIZE) { - eventTxt = eventTxt.Substring(0, 32000); + eventTxt = eventTxt.Substring(0, MAX_EVENTLOG_MESSAGE_SIZE); } EventLogEntryType entryType = GetEntryType(loggingEvent.Level); @@ -614,6 +614,74 @@ namespace log4net.Appender /// private readonly static Type declaringType = typeof(EventLogAppender); + /// + /// The maximum size that the operating system supports for + /// a event log message. + /// + /// + /// Used to determine the maximum string length that can be written + /// to the operating system event log and eventually truncate a string + /// that exceeds the limits. + /// + private readonly static int MAX_EVENTLOG_MESSAGE_SIZE = GetMaxEventLogMessageSize(); + + /// + /// The maximum size supported by default. + /// + /// + /// http://msdn.microsoft.com/en-us/library/xzwc042w(v=vs.100).aspx + /// The 32766 documented max size is two bytes shy of 32K (I'm assuming 32766 + /// may leave space for a two byte null terminator of #0#0). The 32766 max + /// length is what the .NET 4.0 source code checks for, but this is WRONG! + /// Strings with a length > 31839 on Windows Vista or higher can CORRUPT + /// the event log! See: System.Diagnostics.EventLogInternal.InternalWriteEvent() + /// for the use of the 32766 max size. + /// + private readonly static int MAX_EVENTLOG_MESSAGE_SIZE_DEFAULT = 32766; + + /// + /// The maximum size supported by a windows operating system that is vista + /// or newer. + /// + /// + /// See ReportEvent API: + /// http://msdn.microsoft.com/en-us/library/aa363679(VS.85).aspx + /// ReportEvent's lpStrings parameter: + /// "A pointer to a buffer containing an array of + /// null-terminated strings that are merged into the message before Event Viewer + /// displays the string to the user. This parameter must be a valid pointer + /// (or NULL), even if wNumStrings is zero. Each string is limited to 31,839 characters." + /// + /// Going beyond the size of 31839 will (at some point) corrupt the event log on Windows + /// Vista or higher! It may succeed for a while...but you will eventually run into the + /// error: "System.ComponentModel.Win32Exception : A device attached to the system is + /// not functioning", and the event log will then be corrupt (I was able to corrupt + /// an event log using a length of 31877 on Windows 7). + /// + /// The max size for Windows Vista or higher is documented here: + /// http://msdn.microsoft.com/en-us/library/xzwc042w(v=vs.100).aspx. + /// Going over this size may succeed a few times but the buffer will overrun and + /// eventually corrupt the log (based on testing). + /// + /// The maxEventMsgSize size is based on the max buffer size of the lpStrings parameter of the ReportEvent API. + /// The documented max size for EventLog
svn commit: r1437281 - /logging/log4net/trunk/src/Appender/RollingFileAppender.cs
Author: dpsenner Date: Wed Jan 23 07:45:03 2013 New Revision: 1437281 URL: http://svn.apache.org/viewvc?rev=1437281&view=rev Log: LOG4NET-369 fix the rolling file appender to consider preserveLogFileNameExtension when rolling over time after an application restart Modified: logging/log4net/trunk/src/Appender/RollingFileAppender.cs Modified: logging/log4net/trunk/src/Appender/RollingFileAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/RollingFileAppender.cs?rev=1437281&r1=1437280&r2=1437281&view=diff == --- logging/log4net/trunk/src/Appender/RollingFileAppender.cs (original) +++ logging/log4net/trunk/src/Appender/RollingFileAppender.cs Wed Jan 23 07:45:03 2013 @@ -813,7 +813,7 @@ namespace log4net.Appender if (!(last.ToString(m_datePattern,System.Globalization.DateTimeFormatInfo.InvariantInfo).Equals(m_now.ToString(m_datePattern, System.Globalization.DateTimeFormatInfo.InvariantInfo { - m_scheduledFilename = m_baseFileName + last.ToString(m_datePattern, System.Globalization.DateTimeFormatInfo.InvariantInfo); + m_scheduledFilename = CombinePath(m_baseFileName, last.ToString(m_datePattern, System.Globalization.DateTimeFormatInfo.InvariantInfo)); LogLog.Debug(declaringType, "Initial roll over to ["+m_scheduledFilename+"]"); RollOverTime(false); LogLog.Debug(declaringType, "curSizeRollBackups after rollOver at ["+m_curSizeRollBackups+"]");
svn commit: r1446054 - /logging/log4net/trunk/src/AssemblyInfo.cs
Author: dpsenner Date: Thu Feb 14 07:21:25 2013 New Revision: 1446054 URL: http://svn.apache.org/r1446054 Log: LOG4NET-347 fix the AssemblyInfo to allow partial trust applications on .NET 4.0 Modified: logging/log4net/trunk/src/AssemblyInfo.cs Modified: logging/log4net/trunk/src/AssemblyInfo.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/AssemblyInfo.cs?rev=1446054&r1=1446053&r2=1446054&view=diff == --- logging/log4net/trunk/src/AssemblyInfo.cs (original) +++ logging/log4net/trunk/src/AssemblyInfo.cs Thu Feb 14 07:21:25 2013 @@ -39,6 +39,14 @@ using System.Runtime.CompilerServices; [assembly: System.Security.AllowPartiallyTrustedCallers] #endif +#if (NET_4_0) +// +// Allows partial trust applications (e.g. ASP.NET shared hosting) on .NET 4.0 to work +// given our implementation of ISerializable. +// +[assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)] +#endif + // // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information
svn commit: r1461433 - /logging/log4net/trunk/src/Appender/RemoteSyslogAppender.cs
Author: dpsenner Date: Wed Mar 27 07:25:11 2013 New Revision: 1461433 URL: http://svn.apache.org/r1461433 Log: LOG4NET-370 fix the RemoteSyslogAppender to properly handle log messages that contain newlines This patch is based on the work of Jarrod Alexander. Please note that this patch also fixes indentation issues and thus contains some portions of refactoring. Finally it is worth to note that the patch primarily focuses on making the syslog messages RFC3164 (http://www.ietf.org/rfc/rfc3164.txt) compliant. The signifant parts of the RFC are: 4.1.3 MSG Part of a syslog Packet The MSG part will fill the remainder of the syslog packet. This will usually contain some additional information of the process that generated the message, and then the text of the message. There is no ending delimiter to this part. The MSG part of the syslog packet MUST contain visible (printing) characters. The code set traditionally and most often used has also been seven-bit ASCII in an eight-bit field like that used in the PRI and HEADER parts. In this code set, the only allowable characters are the ABNF VCHAR values (%d33-126) and spaces (SP value %d32). However, no indication of the code set used within the MSG is required, nor is it expected. Other code sets MAY be used as long as the characters used in the MSG are exclusively visible characters and spaces similar to those described above. The selection of a code set used in the MSG part SHOULD be made with thoughts of the intended receiver. A message containing characters in a code set that cannot be viewed or understood by a recipient will yield no information of value to an operator or administrator looking at it. Modified: logging/log4net/trunk/src/Appender/RemoteSyslogAppender.cs Modified: logging/log4net/trunk/src/Appender/RemoteSyslogAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/RemoteSyslogAppender.cs?rev=1461433&r1=1461432&r2=1461433&view=diff == --- logging/log4net/trunk/src/Appender/RemoteSyslogAppender.cs (original) +++ logging/log4net/trunk/src/Appender/RemoteSyslogAppender.cs Wed Mar 27 07:25:11 2013 @@ -24,7 +24,7 @@ using log4net.Appender; using log4net.Util; using log4net.Layout; -namespace log4net.Appender +namespace log4net.Appender { /// /// Logs events to a remote syslog daemon. @@ -66,7 +66,7 @@ namespace log4net.Appender /// /// Rob Lyon /// Nicko Cadell - public class RemoteSyslogAppender : UdpAppender + public class RemoteSyslogAppender : UdpAppender { /// /// Syslog port 514 @@ -268,7 +268,7 @@ namespace log4net.Appender /// This instance of the class is set up to write /// to a remote syslog daemon. /// - public RemoteSyslogAppender() + public RemoteSyslogAppender() { // syslog udp defaults this.RemotePort = DefaultSyslogPort; @@ -279,7 +279,7 @@ namespace log4net.Appender #endregion Public Instance Constructors #region Public Instance Properties - + /// /// Message identity /// @@ -310,7 +310,7 @@ namespace log4net.Appender get { return m_facility; } set { m_facility = value; } } - + #endregion Public Instance Properties /// @@ -341,46 +341,68 @@ namespace log4net.Appender /// The format of the output will depend on the appender's layout. /// /// - protected override void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { - try + try { - System.IO.StringWriter writer = new System.IO.StringWriter(System.Globalization.CultureInfo.InvariantCulture); + using (ReusableStringWriter writer = new ReusableStringWriter(System.Globalization.CultureInfo.InvariantCulture)) + { + // Priority + int priority = GeneratePriority(m_facility, GetSeverity(loggingEvent.Level)); - // Priority - int priority = GeneratePriority(m_facility, GetSeverity(loggingEvent.Level)); - writer.Write('<'); - writer.Write(priority); - writer.Write('>'); +
svn commit: r1461462 - /logging/log4net/trunk/src/site/xdoc/release/manual/introduction.xml
Author: dpsenner Date: Wed Mar 27 09:17:09 2013 New Revision: 1461462 URL: http://svn.apache.org/r1461462 Log: LOG4NET-371 mention in the introduction that *Format methods do not use ObjectRenderers Modified: logging/log4net/trunk/src/site/xdoc/release/manual/introduction.xml Modified: logging/log4net/trunk/src/site/xdoc/release/manual/introduction.xml URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/release/manual/introduction.xml?rev=1461462&r1=1461461&r2=1461462&view=diff == --- logging/log4net/trunk/src/site/xdoc/release/manual/introduction.xml (original) +++ logging/log4net/trunk/src/site/xdoc/release/manual/introduction.xml Wed Mar 27 09:17:09 2013 @@ -1027,6 +1027,11 @@ ILog y = LogManager.GetLogger("wombat"); log4net.ObjectRenderer.IObjectRenderer interface. + +Please note that ObjectRenderers are not used by the DebugFormat, +InfoFormat, WarnFormat, +ErrorFormat and FatalFormat methods. +
svn commit: r856137 [3/3] - in /websites/production/logging/content/log4net/log4net-1.2.11: ./ release/manual/
Modified: websites/production/logging/content/log4net/log4net-1.2.11/release/manual/introduction.html == --- websites/production/logging/content/log4net/log4net-1.2.11/release/manual/introduction.html (original) +++ websites/production/logging/content/log4net/log4net-1.2.11/release/manual/introduction.html Wed Mar 27 09:39:57 2013 @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> - + http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -12,7 +12,7 @@ - + @@ -29,7 +29,7 @@ -Last Published: 2012-11-28 +Last Published: 2013-03-27 | Version: 1.2.12-SNAPSHOT | http://www.apache.org/"; class="externalLink" title="Apache">Apache > @@ -1188,6 +1188,11 @@ ILog y = LogManager.GetLogger("womb log4net.ObjectRenderer.IObjectRenderer interface. + +Please note that a ObjectRenderer are not used by the DebugFormat, +InfoFormat, WarnFormat, +ErrorFormat and FatalFormat methods. + @@ -1202,7 +1207,7 @@ ILog y = LogManager.GetLogger("womb -Copyright ©2004-2012 +Copyright ©2004-2013 http://www.apache.org";>Apache Software Foundation. Modified: websites/production/logging/content/log4net/log4net-1.2.11/source-repository.html == --- websites/production/logging/content/log4net/log4net-1.2.11/source-repository.html (original) +++ websites/production/logging/content/log4net/log4net-1.2.11/source-repository.html Wed Mar 27 09:39:57 2013 @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> - + http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import url("./css/site.css"); - + @@ -27,7 +27,7 @@ -Last Published: 2012-11-29 +Last Published: 2013-03-27 | Version: 1.2.12-SNAPSHOT | http://www.apache.org/"; class="externalLink" title="Apache">Apache > @@ -214,7 +214,7 @@ http-proxy-port = 3128 -Copyright ©2004-2012 +Copyright ©2004-2013 http://www.apache.org";>Apache Software Foundation. Modified: websites/production/logging/content/log4net/log4net-1.2.11/team-list.html == --- websites/production/logging/content/log4net/log4net-1.2.11/team-list.html (original) +++ websites/production/logging/content/log4net/log4net-1.2.11/team-list.html Wed Mar 27 09:39:57 2013 @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> - + http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import url("./css/site.css"); - + @@ -27,7 +27,7 @@ -Last Published: 2012-11-29 +Last Published: 2013-03-27 | Version: 1.2.12-SNAPSHOT | http://www.apache.org/"; class="externalLink" title="Apache">Apache > @@ -226,7 +226,7 @@ window.onLoad = init(); -Copyright ©2004-2012 +Copyright ©2004-2013 http://www.apache.org";>Apache Software Foundation.
svn commit: r856137 [1/3] - in /websites/production/logging/content/log4net/log4net-1.2.11: ./ release/manual/
Author: dpsenner Date: Wed Mar 27 09:39:57 2013 New Revision: 856137 Log: LOG4NET-371 generated website with a new paragraph in the introduction section renderers Modified: websites/production/logging/content/log4net/log4net-1.2.11/dependencies.html websites/production/logging/content/log4net/log4net-1.2.11/integration.html websites/production/logging/content/log4net/log4net-1.2.11/issue-tracking.html websites/production/logging/content/log4net/log4net-1.2.11/license.html websites/production/logging/content/log4net/log4net-1.2.11/mail-lists.html websites/production/logging/content/log4net/log4net-1.2.11/plugin-management.html websites/production/logging/content/log4net/log4net-1.2.11/plugins.html websites/production/logging/content/log4net/log4net-1.2.11/project-info.html websites/production/logging/content/log4net/log4net-1.2.11/project-reports.html websites/production/logging/content/log4net/log4net-1.2.11/project-summary.html websites/production/logging/content/log4net/log4net-1.2.11/rat-report.html websites/production/logging/content/log4net/log4net-1.2.11/release/manual/introduction.html websites/production/logging/content/log4net/log4net-1.2.11/source-repository.html websites/production/logging/content/log4net/log4net-1.2.11/team-list.html Modified: websites/production/logging/content/log4net/log4net-1.2.11/dependencies.html == --- websites/production/logging/content/log4net/log4net-1.2.11/dependencies.html (original) +++ websites/production/logging/content/log4net/log4net-1.2.11/dependencies.html Wed Mar 27 09:39:57 2013 @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> - + http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import url("./css/site.css"); - + @@ -27,7 +27,7 @@ -Last Published: 2012-11-29 +Last Published: 2013-03-27 | Version: 1.2.12-SNAPSHOT | http://www.apache.org/"; class="externalLink" title="Apache">Apache > @@ -211,7 +211,7 @@ -Copyright ©2004-2012 +Copyright ©2004-2013 http://www.apache.org";>Apache Software Foundation. Modified: websites/production/logging/content/log4net/log4net-1.2.11/integration.html == --- websites/production/logging/content/log4net/log4net-1.2.11/integration.html (original) +++ websites/production/logging/content/log4net/log4net-1.2.11/integration.html Wed Mar 27 09:39:57 2013 @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> - + http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import url("./css/site.css"); - + @@ -27,7 +27,7 @@ -Last Published: 2012-11-29 +Last Published: 2013-03-27 | Version: 1.2.12-SNAPSHOT | http://www.apache.org/"; class="externalLink" title="Apache">Apache > @@ -211,7 +211,7 @@ -Copyright ©2004-2012 +Copyright ©2004-2013 http://www.apache.org";>Apache Software Foundation. Modified: websites/production/logging/content/log4net/log4net-1.2.11/issue-tracking.html == --- websites/production/logging/content/log4net/log4net-1.2.11/issue-tracking.html (original) +++ websites/production/logging/content/log4net/log4net-1.2.11/issue-tracking.html Wed Mar 27 09:39:57 2013 @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> - + http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import url("./css/site.css"); - + @@ -27,7 +27,7 @@ -Last Published: 2012-11-29 +Last Published: 2013-03-27 | Version: 1.2.12-SNAPSHOT | http://www.apache.org/"; class="externalLink" title="Apache">Apache > @@ -211,7 +211,7 @@ -Copyright ©2004
svn commit: r856139 - in /websites/production/logging/content/log4net/log4net-1.2.11: download_log4net.html history.html index.html rat-report.html release/manual/introduction.html roadmap.html
Author: dpsenner Date: Wed Mar 27 09:47:17 2013 New Revision: 856139 Log: LOG4NET-371 generated website again the last build was obstructed Modified: websites/production/logging/content/log4net/log4net-1.2.11/download_log4net.html websites/production/logging/content/log4net/log4net-1.2.11/history.html websites/production/logging/content/log4net/log4net-1.2.11/index.html websites/production/logging/content/log4net/log4net-1.2.11/rat-report.html websites/production/logging/content/log4net/log4net-1.2.11/release/manual/introduction.html websites/production/logging/content/log4net/log4net-1.2.11/roadmap.html Modified: websites/production/logging/content/log4net/log4net-1.2.11/download_log4net.html == --- websites/production/logging/content/log4net/log4net-1.2.11/download_log4net.html (original) +++ websites/production/logging/content/log4net/log4net-1.2.11/download_log4net.html Wed Mar 27 09:47:17 2013 @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> - + http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -11,7 +11,7 @@ @import url("./css/site.css"); - + @@ -28,7 +28,7 @@ -Last Published: 2012-11-29 +Last Published: 2013-03-27 | Version: 1.2.12-SNAPSHOT | http://www.apache.org/"; class="externalLink" title="Apache">Apache > @@ -310,7 +310,7 @@ limitations under the License. --> -Copyright ©2004-2012 +Copyright ©2004-2013 http://www.apache.org";>Apache Software Foundation. Modified: websites/production/logging/content/log4net/log4net-1.2.11/history.html == --- websites/production/logging/content/log4net/log4net-1.2.11/history.html (original) +++ websites/production/logging/content/log4net/log4net-1.2.11/history.html Wed Mar 27 09:47:17 2013 @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> - + http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -12,7 +12,7 @@ - + @@ -29,7 +29,7 @@ -Last Published: 2012-11-29 +Last Published: 2013-03-27 | Version: 1.2.12-SNAPSHOT | http://www.apache.org/"; class="externalLink" title="Apache">Apache > @@ -225,7 +225,7 @@ limitations under the License. --> -Copyright ©2004-2012 +Copyright ©2004-2013 http://www.apache.org";>Apache Software Foundation. Modified: websites/production/logging/content/log4net/log4net-1.2.11/index.html == --- websites/production/logging/content/log4net/log4net-1.2.11/index.html (original) +++ websites/production/logging/content/log4net/log4net-1.2.11/index.html Wed Mar 27 09:47:17 2013 @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> - + http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -12,7 +12,7 @@ - + @@ -29,7 +29,7 @@ -Last Published: 2012-11-29 +Last Published: 2013-03-27 | Version: 1.2.12-SNAPSHOT | http://www.apache.org/"; class="externalLink" title="Apache">Apache > @@ -250,7 +250,7 @@ limitations under the License. --> -Copyright ©2004-2012 +Copyright ©2004-2013 http://www.apache.org";>Apache Software Foundation. Modified: websites/production/logging/content/log4net/log4net-1.2.11/rat-report.html == --- websites/production/logging/content/log4net/log4net-1.2.11/rat-report.html (original) +++ websites/production/logging/content/log4net/log4net-1.2.11/rat-report.html Wed Mar 27 09:47:17 2013 @@ -178,7 +178,7 @@ Summary --- Notes: 7 -Binaries: 761 +Binaries: 760 Archives: 0 Standards: 679 @@ -1562,7 +1562,6 @@ Archives: ALsrc/site/xdoc/release/framewor
svn commit: r856143 [3/3] - in /websites/production/logging/content/log4net/log4net-1.2.11: ./ release/ release/howto/ release/manual/
Modified: websites/production/logging/content/log4net/log4net-1.2.11/release/building.html == --- websites/production/logging/content/log4net/log4net-1.2.11/release/building.html (original) +++ websites/production/logging/content/log4net/log4net-1.2.11/release/building.html Wed Mar 27 10:04:03 2013 @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> - + http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -12,7 +12,7 @@ - + @@ -29,7 +29,7 @@ -Last Published: 2012-11-28 +Last Published: 2013-03-27 | Version: 1.2.12-SNAPSHOT | http://www.apache.org/"; class="externalLink" title="Apache">Apache > @@ -303,7 +303,7 @@ build.cmd compile-all -Copyright ©2004-2012 +Copyright ©2004-2013 http://www.apache.org";>Apache Software Foundation. Modified: websites/production/logging/content/log4net/log4net-1.2.11/release/config-examples.html == --- websites/production/logging/content/log4net/log4net-1.2.11/release/config-examples.html (original) +++ websites/production/logging/content/log4net/log4net-1.2.11/release/config-examples.html Wed Mar 27 10:04:03 2013 @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> - + http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -12,7 +12,7 @@ - + @@ -29,7 +29,7 @@ -Last Published: 2012-11-28 +Last Published: 2013-03-27 | Version: 1.2.12-SNAPSHOT | http://www.apache.org/"; class="externalLink" title="Apache">Apache > @@ -1255,7 +1255,7 @@ CREATE TABLE Log ( -Copyright ©2004-2012 +Copyright ©2004-2013 http://www.apache.org";>Apache Software Foundation. Modified: websites/production/logging/content/log4net/log4net-1.2.11/release/example-apps.html == --- websites/production/logging/content/log4net/log4net-1.2.11/release/example-apps.html (original) +++ websites/production/logging/content/log4net/log4net-1.2.11/release/example-apps.html Wed Mar 27 10:04:03 2013 @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> - + http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -12,7 +12,7 @@ - + @@ -29,7 +29,7 @@ -Last Published: 2012-11-28 +Last Published: 2013-03-27 | Version: 1.2.12-SNAPSHOT | http://www.apache.org/"; class="externalLink" title="Apache">Apache > @@ -638,7 +638,7 @@ limitations under the License. --> -Copyright ©2004-2012 +Copyright ©2004-2013 http://www.apache.org";>Apache Software Foundation. Modified: websites/production/logging/content/log4net/log4net-1.2.11/release/faq.html == --- websites/production/logging/content/log4net/log4net-1.2.11/release/faq.html (original) +++ websites/production/logging/content/log4net/log4net-1.2.11/release/faq.html Wed Mar 27 10:04:03 2013 @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> - + http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -12,7 +12,7 @@ - + @@ -29,7 +29,7 @@ -Last Published: 2012-11-28 +Last Published: 2013-03-27 | Version: 1.2.12-SNAPSHOT | http://www.apache.org/"; class="externalLink" title="Apache">Apache > @@ -1303,7 +1303,7 @@ public class FastLogger -Copyright ©2004-2012 +Copyright ©2004-2013 http://www.apache.org";>Apache Software Foundation. Modified: websites/production/logging/content/log4net/log4net-1.2.11/release/features.html == --- websites/production/logging/content
svn commit: r856143 [1/3] - in /websites/production/logging/content/log4net/log4net-1.2.11: ./ release/ release/howto/ release/manual/
Author: dpsenner Date: Wed Mar 27 10:04:03 2013 New Revision: 856143 Log: LOG4NET-371 generated website the last build was obstructed again Modified: websites/production/logging/content/log4net/log4net-1.2.11/rat-report.html websites/production/logging/content/log4net/log4net-1.2.11/release/building.html websites/production/logging/content/log4net/log4net-1.2.11/release/config-examples.html websites/production/logging/content/log4net/log4net-1.2.11/release/example-apps.html websites/production/logging/content/log4net/log4net-1.2.11/release/faq.html websites/production/logging/content/log4net/log4net-1.2.11/release/features.html websites/production/logging/content/log4net/log4net-1.2.11/release/framework-support.html websites/production/logging/content/log4net/log4net-1.2.11/release/howto/chainsaw.html websites/production/logging/content/log4net/log4net-1.2.11/release/howto/index.html websites/production/logging/content/log4net/log4net-1.2.11/release/manual/configuration.html websites/production/logging/content/log4net/log4net-1.2.11/release/manual/contexts.html websites/production/logging/content/log4net/log4net-1.2.11/release/manual/internals.html websites/production/logging/content/log4net/log4net-1.2.11/release/manual/plugins.html websites/production/logging/content/log4net/log4net-1.2.11/release/manual/repositories.html websites/production/logging/content/log4net/log4net-1.2.11/release/release-notes.html
svn commit: r1467173 - /logging/log4net/trunk/src/Repository/Hierarchy/XmlHierarchyConfigurator.cs
Author: dpsenner Date: Fri Apr 12 06:38:41 2013 New Revision: 1467173 URL: http://svn.apache.org/r1467173 Log: LOG4NET-375 fix typo in src/Repository/Hierarchy/XmlHierarchyConfigurator.cs Modified: logging/log4net/trunk/src/Repository/Hierarchy/XmlHierarchyConfigurator.cs Modified: logging/log4net/trunk/src/Repository/Hierarchy/XmlHierarchyConfigurator.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Repository/Hierarchy/XmlHierarchyConfigurator.cs?rev=1467173&r1=1467172&r2=1467173&view=diff == --- logging/log4net/trunk/src/Repository/Hierarchy/XmlHierarchyConfigurator.cs (original) +++ logging/log4net/trunk/src/Repository/Hierarchy/XmlHierarchyConfigurator.cs Fri Apr 12 06:38:41 2013 @@ -345,7 +345,7 @@ namespace log4net.Repository.Hierarchy optionHandler.ActivateOptions(); } - LogLog.Debug(declaringType, "reated Appender [" + appenderName + "]"); + LogLog.Debug(declaringType, "Created Appender [" + appenderName + "]"); return appender; } catch (Exception ex)
svn commit: r1467176 - /logging/log4net/trunk/src/Appender/RemoteSyslogAppender.cs
Author: dpsenner Date: Fri Apr 12 06:53:20 2013 New Revision: 1467176 URL: http://svn.apache.org/r1467176 Log: LOG4NET-370 fix RemoteSyslogAppender to log only characters that are valid as of RFC http://www.ietf.org/rfc/rfc3164.txt Modified: logging/log4net/trunk/src/Appender/RemoteSyslogAppender.cs Modified: logging/log4net/trunk/src/Appender/RemoteSyslogAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/RemoteSyslogAppender.cs?rev=1467176&r1=1467175&r2=1467176&view=diff == --- logging/log4net/trunk/src/Appender/RemoteSyslogAppender.cs (original) +++ logging/log4net/trunk/src/Appender/RemoteSyslogAppender.cs Fri Apr 12 06:53:20 2013 @@ -23,6 +23,7 @@ using log4net.Core; using log4net.Appender; using log4net.Util; using log4net.Layout; +using System.Text; namespace log4net.Appender { @@ -343,68 +344,84 @@ namespace log4net.Appender /// protected override void Append(LoggingEvent loggingEvent) { - try - { - using (ReusableStringWriter writer = new ReusableStringWriter(System.Globalization.CultureInfo.InvariantCulture)) - { - // Priority - int priority = GeneratePriority(m_facility, GetSeverity(loggingEvent.Level)); - - // Identity - string identity; - - if (m_identity != null) - { - identity = m_identity.Format(loggingEvent); - } - else - { - identity = loggingEvent.Domain; - } - - // Message. The message goes after the tag/identity - string message = RenderLoggingEvent(loggingEvent); - - // Split message by line to ensure that the syslog - // message is compliant to the RFC - // http://www.ietf.org/rfc/rfc3164.txt in section 4.1.3 - string[] lines = message.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); - - Byte[] buffer; - - foreach (string line in lines) - { - writer.Reset(c_renderBufferMaxCapacity, c_renderBufferSize); - - // Write priority - writer.Write('<'); - writer.Write(priority); - writer.Write('>'); - - // Write identity - writer.Write(identity); - writer.Write(": "); - - // Write message line - writer.Write(line); - - // Grab as a byte array - buffer = this.Encoding.GetBytes(writer.ToString()); - - this.Client.Send(buffer, buffer.Length, this.RemoteEndPoint); - } - } - } - catch (Exception e) - { - ErrorHandler.Error( - "Unable to send logging event to remote syslog " + - this.RemoteAddress.ToString() + - " on port " + - this.RemotePort + ".", - e, - ErrorCode.WriteFailure); - } +try +{ +// Priority +int priority = GeneratePriority(m_facility, GetSeverity(loggingEvent.Level)); + +// Identity +string identity; + +if (m_identity != null) +{ +identity = m_identity.Format(loggingEvent); +} +else +{ +
svn commit: r1467178 - /logging/log4net/trunk/pom.xml
Author: dpsenner Date: Fri Apr 12 06:58:58 2013 New Revision: 1467178 URL: http://svn.apache.org/r1467178 Log: Added Jarrod Alexander to the list of contributors Modified: logging/log4net/trunk/pom.xml Modified: logging/log4net/trunk/pom.xml URL: http://svn.apache.org/viewvc/logging/log4net/trunk/pom.xml?rev=1467178&r1=1467177&r2=1467178&view=diff == --- logging/log4net/trunk/pom.xml (original) +++ logging/log4net/trunk/pom.xml Fri Apr 12 06:58:58 2013 @@ -257,6 +257,9 @@ Thomas Voss + + Jarrod Alexander +
svn commit: r1483375 - /logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs
Author: dpsenner Date: Thu May 16 14:02:22 2013 New Revision: 1483375 URL: http://svn.apache.org/r1483375 Log: LOG4NET-376 fixed a race condition in AbsoluteTimeDateFormatter by adding a lock around s_lastTimeStrings Modified: logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs Modified: logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs?rev=1483375&r1=1483374&r2=1483375&view=diff == --- logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs (original) +++ logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs Thu May 16 14:02:22 2013 @@ -101,64 +101,67 @@ namespace log4net.DateFormatter /// virtual public void FormatDate(DateTime dateToFormat, TextWriter writer) { - // Calculate the current time precise only to the second - long currentTimeToTheSecond = (dateToFormat.Ticks - (dateToFormat.Ticks % TimeSpan.TicksPerSecond)); + lock (s_lastTimeStrings) + { + // Calculate the current time precise only to the second + long currentTimeToTheSecond = (dateToFormat.Ticks - (dateToFormat.Ticks % TimeSpan.TicksPerSecond)); -string timeString = null; - // Compare this time with the stored last time - // If we are in the same second then append - // the previously calculated time string -if (s_lastTimeToTheSecond != currentTimeToTheSecond) -{ -s_lastTimeStrings.Clear(); -} -else -{ -timeString = (string) s_lastTimeStrings[GetType()]; -} - -if (timeString == null) -{ - // lock so that only one thread can use the buffer and - // update the s_lastTimeToTheSecond and s_lastTimeStrings + string timeString = null; + // Compare this time with the stored last time + // If we are in the same second then append + // the previously calculated time string + if (s_lastTimeToTheSecond != currentTimeToTheSecond) + { + s_lastTimeStrings.Clear(); + } + else + { + timeString = (string)s_lastTimeStrings[GetType()]; + } - // PERF: Try removing this lock and using a new StringBuilder each time - lock(s_lastTimeBuf) + if (timeString == null) { -timeString = (string) s_lastTimeStrings[GetType()]; + // lock so that only one thread can use the buffer and + // update the s_lastTimeToTheSecond and s_lastTimeStrings -if (timeString == null) -{ - // We are in a new second. - s_lastTimeBuf.Length = 0; + // PERF: Try removing this lock and using a new StringBuilder each time + lock (s_lastTimeBuf) + { + timeString = (string)s_lastTimeStrings[GetType()]; + + if (timeString == null) + { + // We are in a new second. + s_lastTimeBuf.Length = 0; - // Calculate the new string for this second - FormatDateWithoutMillis(dateToFormat, s_lastTimeBuf); + // Calculate the new string for this second + FormatDateWithoutMillis(dateToFormat, s_lastTimeBuf); - // Render the string buffer
svn commit: r1483378 - /logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs
Author: dpsenner Date: Thu May 16 14:07:58 2013 New Revision: 1483378 URL: http://svn.apache.org/r1483378 Log: LOG4NET-376 extended the lock around s_lastTimeStrings in AbsoluteTimeDateFormatter This fix should prevent obstructed output in multithreaded environments. Modified: logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs Modified: logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs?rev=1483378&r1=1483377&r2=1483378&view=diff == --- logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs (original) +++ logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs Thu May 16 14:07:58 2013 @@ -152,20 +152,20 @@ namespace log4net.DateFormatter } } writer.Write(timeString); + + // Append the current millisecond info + writer.Write(','); + int millis = dateToFormat.Millisecond; + if (millis < 100) + { + writer.Write('0'); + } + if (millis < 10) + { + writer.Write('0'); + } + writer.Write(millis); } - - // Append the current millisecond info - writer.Write(','); - int millis = dateToFormat.Millisecond; - if (millis < 100) - { - writer.Write('0'); - } - if (millis < 10) - { - writer.Write('0'); - } - writer.Write(millis); } #endregion Implementation of IDateFormatter
svn commit: r1486596 - /logging/log4net/trunk/src/Appender/RollingFileAppender.cs
Author: dpsenner Date: Mon May 27 12:45:46 2013 New Revision: 1486596 URL: http://svn.apache.org/r1486596 Log: LOG4NET-378 fixed a problem where rolled log files get overwritten when the application is restarted The cause is that InitializeFromOneFile() does not succesfully detect the filenames. Modified: logging/log4net/trunk/src/Appender/RollingFileAppender.cs Modified: logging/log4net/trunk/src/Appender/RollingFileAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/RollingFileAppender.cs?rev=1486596&r1=1486595&r2=1486596&view=diff == --- logging/log4net/trunk/src/Appender/RollingFileAppender.cs (original) +++ logging/log4net/trunk/src/Appender/RollingFileAppender.cs Mon May 27 12:45:46 2013 @@ -904,7 +904,10 @@ namespace log4net.Appender // Only look for files in the current roll point if (m_rollDate && !m_staticLogFileName) { - if (! curFileName.StartsWith(CombinePath(baseFile, m_dateTime.Now.ToString(m_datePattern, System.Globalization.DateTimeFormatInfo.InvariantInfo + string date = m_dateTime.Now.ToString(m_datePattern, System.Globalization.DateTimeFormatInfo.InvariantInfo); + string prefix = m_preserveLogFileNameExtension ? Path.GetFileNameWithoutExtension(baseFile) + date : baseFile + date; + string suffix = m_preserveLogFileNameExtension ? Path.GetExtension(baseFile) : ""; + if (!curFileName.StartsWith(prefix) || !curFileName.EndsWith(suffix)) { LogLog.Debug(declaringType, "Ignoring file ["+curFileName+"] because it is from a different date period"); return;
svn commit: r1486868 - /logging/log4net/trunk/src/Appender/FileAppender.cs
Author: dpsenner Date: Tue May 28 11:16:51 2013 New Revision: 1486868 URL: http://svn.apache.org/r1486868 Log: LOG4NET-379 fixed an avoidable NullReferenceException raised in the Fileappender ActivateOptions() Modified: logging/log4net/trunk/src/Appender/FileAppender.cs Modified: logging/log4net/trunk/src/Appender/FileAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/FileAppender.cs?rev=1486868&r1=1486867&r2=1486868&view=diff == --- logging/log4net/trunk/src/Appender/FileAppender.cs (original) +++ logging/log4net/trunk/src/Appender/FileAppender.cs Tue May 28 11:16:51 2013 @@ -963,14 +963,13 @@ namespace log4net.Appender } m_lockingModel.CurrentAppender=this; - - using(SecurityContext.Impersonate(this)) - { - m_fileName = ConvertToFullPath(m_fileName.Trim()); - } - + if (m_fileName != null) { + using(SecurityContext.Impersonate(this)) + { + m_fileName = ConvertToFullPath(m_fileName.Trim()); + } SafeOpenFile(m_fileName, m_appendToFile); } else
svn commit: r1486883 - in /logging/log4net/trunk/src: ./ Core/ DateFormatter/ Layout/Pattern/
Author: dpsenner Date: Tue May 28 11:40:46 2013 New Revision: 1486883 URL: http://svn.apache.org/r1486883 Log: LOG4NET-341 fix location info to not contain a reference to StackFrame any more Added: logging/log4net/trunk/src/Core/MethodItem.cs logging/log4net/trunk/src/Core/StackFrameItem.cs Modified: logging/log4net/trunk/src/Core/LocationInfo.cs logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs logging/log4net/trunk/src/Layout/Pattern/StackTraceDetailPatternConverter.cs logging/log4net/trunk/src/Layout/Pattern/StackTracePatternConverter.cs logging/log4net/trunk/src/log4net.vs2008.csproj logging/log4net/trunk/src/log4net.vs2010.csproj Modified: logging/log4net/trunk/src/Core/LocationInfo.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Core/LocationInfo.cs?rev=1486883&r1=1486882&r2=1486883&view=diff == --- logging/log4net/trunk/src/Core/LocationInfo.cs (original) +++ logging/log4net/trunk/src/Core/LocationInfo.cs Tue May 28 11:40:46 2013 @@ -118,10 +118,10 @@ namespace log4net.Core // take into account the frames we skip above int adjustedFrameCount = st.FrameCount - frameIndex; ArrayList stackFramesList = new ArrayList(adjustedFrameCount); - m_stackFrames = new StackFrame[adjustedFrameCount]; + m_stackFrames = new StackFrameItem[adjustedFrameCount]; for (int i=frameIndex; i < st.FrameCount; i++) { - stackFramesList.Add(st.GetFrame(i)); + stackFramesList.Add(new StackFrameItem(st.GetFrame(i))); } stackFramesList.CopyTo(m_stackFrames, 0); @@ -275,7 +275,7 @@ namespace log4net.Core /// /// Gets the stack frames from the stack trace of the caller making the log request /// - public StackFrame[] StackFrames + public StackFrameItem[] StackFrames { get { return m_stackFrames; } } @@ -291,7 +291,7 @@ namespace log4net.Core private readonly string m_methodName; private readonly string m_fullInfo; #if !NETCF - private readonly StackFrame[] m_stackFrames; + private readonly StackFrameItem[] m_stackFrames; #endif #endregion Private Instance Fields Added: logging/log4net/trunk/src/Core/MethodItem.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Core/MethodItem.cs?rev=1486883&view=auto == --- logging/log4net/trunk/src/Core/MethodItem.cs (added) +++ logging/log4net/trunk/src/Core/MethodItem.cs Tue May 28 11:40:46 2013 @@ -0,0 +1,172 @@ +#region Apache License +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to you under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#endregion +using System; +using System.Collections.Generic; +using System.Text; +using System.Collections; + +using log4net.Util; + +namespace log4net.Core +{ + /// + /// provides method information without actually referencing a System.Reflection.MethodBase + /// as that would require that the containing assembly is loaded. + /// + /// +#if !NETCF + [Serializable] +#endif + public class MethodItem + { + #region Public Instance Constructors + + /// + /// constructs a method item for an unknown method. + /// + public MethodItem() + { + m_name = NA; +
svn commit: r1486895 - /logging/log4net/trunk/src/Plugin/RemoteLoggingServerPlugin.cs
Author: dpsenner Date: Tue May 28 12:03:12 2013 New Revision: 1486895 URL: http://svn.apache.org/r1486895 Log: LOG4NET-318 add [SecuritySafeCritical] attribute to the Attach method of the RemoteLoggingServerPlugin According to http://stackoverflow.com/questions/8297419/log4net-doesnt-pass-verification-when-compiling this should fix the PEVerify issue reported. Modified: logging/log4net/trunk/src/Plugin/RemoteLoggingServerPlugin.cs Modified: logging/log4net/trunk/src/Plugin/RemoteLoggingServerPlugin.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Plugin/RemoteLoggingServerPlugin.cs?rev=1486895&r1=1486894&r2=1486895&view=diff == --- logging/log4net/trunk/src/Plugin/RemoteLoggingServerPlugin.cs (original) +++ logging/log4net/trunk/src/Plugin/RemoteLoggingServerPlugin.cs Tue May 28 12:03:12 2013 @@ -119,6 +119,9 @@ namespace log4net.Plugin /// This method is called when the plugin is attached to the repository. /// /// +#if NET_4_0 + [System.Security.SecuritySafeCritical] +#endif override public void Attach(ILoggerRepository repository) { base.Attach(repository);
svn commit: r1489735 - /logging/log4net/trunk/src/site/xdoc/release/config-examples.xml
Author: dpsenner Date: Wed Jun 5 07:55:46 2013 New Revision: 1489735 URL: http://svn.apache.org/r1489735 Log: LOG4NET-316 added a configuration example that explains the usage of DynamicPatternLayout Modified: logging/log4net/trunk/src/site/xdoc/release/config-examples.xml Modified: logging/log4net/trunk/src/site/xdoc/release/config-examples.xml URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/release/config-examples.xml?rev=1489735&r1=1489734&r2=1489735&view=diff == --- logging/log4net/trunk/src/site/xdoc/release/config-examples.xml (original) +++ logging/log4net/trunk/src/site/xdoc/release/config-examples.xml Wed Jun 5 07:55:46 2013 @@ -1082,6 +1082,27 @@ CREATE TABLE Log ( ]]> + + + + For full details see the SDK Reference entry: log4net.Layout.DynamicPatternLayout. + + + The DynamicPatternLayout should be used whenever the header or footer should contain information that could change over time. + Compared to the static PatternLayout which does not re-evaluate on every invoke, the DynamicPatternLayout + does re-evaluate the pattern on every invoke. It does, for example, allow to include the current DateTime in the header and/or the footer which was not possible + with the static PatternLayout. + + + The following example shows how to configure the DynamicPatternLayout. + + +
svn commit: r1489736 - in /logging/log4net/trunk/src: Core/LogImpl.cs ILog.cs
Author: dpsenner Date: Wed Jun 5 08:05:32 2013 New Revision: 1489736 URL: http://svn.apache.org/r1489736 Log: LOG4NET-342 added the property Configured to ILog that allows to check if the repository was configured properly Usecase: if (log.Configured == false) { throw new ConfigurationErrorsException("Log4net failed to initialize properly."); } Modified: logging/log4net/trunk/src/Core/LogImpl.cs logging/log4net/trunk/src/ILog.cs Modified: logging/log4net/trunk/src/Core/LogImpl.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Core/LogImpl.cs?rev=1489736&r1=1489735&r2=1489736&view=diff == --- logging/log4net/trunk/src/Core/LogImpl.cs (original) +++ logging/log4net/trunk/src/Core/LogImpl.cs Wed Jun 5 08:05:32 2013 @@ -1254,6 +1254,22 @@ namespace log4net.Core get { return Logger.IsEnabledFor(m_levelFatal); } } + /// + /// Gets the falg that indicates if the repository of this Logger has been configured. + /// + /// + /// true if the repository of this Logger has been configured. + /// + /// + /// + /// Gets the falg that indicates if the repository of this Logger has been configured. + /// + /// + virtual public bool Configured + { + get { return Logger.Repository.Configured; } + } + #endregion Implementation of ILog #region Private Methods Modified: logging/log4net/trunk/src/ILog.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/ILog.cs?rev=1489736&r1=1489735&r2=1489736&view=diff == --- logging/log4net/trunk/src/ILog.cs (original) +++ logging/log4net/trunk/src/ILog.cs Wed Jun 5 08:05:32 2013 @@ -956,5 +956,18 @@ namespace log4net /// /// bool IsFatalEnabled { get; } + + /// + /// Gets the falg that indicates if the repository of this Logger has been configured. + /// + /// + /// true if the repository of this Logger has been configured. + /// + /// + /// + /// Gets the falg that indicates if the repository of this Logger has been configured. + /// + /// + bool Configured { get; } } }
svn commit: r1489769 - /logging/log4net/trunk/src/Appender/SmtpAppender.cs
Author: dpsenner Date: Wed Jun 5 09:28:57 2013 New Revision: 1489769 URL: http://svn.apache.org/r1489769 Log: LOG4NET-354 added a configuration option that allows to configure the subject and body encoding Modified: logging/log4net/trunk/src/Appender/SmtpAppender.cs Modified: logging/log4net/trunk/src/Appender/SmtpAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/SmtpAppender.cs?rev=1489769&r1=1489768&r2=1489769&view=diff == --- logging/log4net/trunk/src/Appender/SmtpAppender.cs (original) +++ logging/log4net/trunk/src/Appender/SmtpAppender.cs Wed Jun 5 09:28:57 2013 @@ -23,6 +23,7 @@ using System; using System.IO; +using System.Text; #if NET_2_0 using System.Net.Mail; @@ -349,6 +350,30 @@ namespace log4net.Appender } #endif + /// + /// Gets or sets the subject encoding to be used. + /// + /// + /// The default encoding is the operating system's current ANSI codepage. + /// + public Encoding SubjectEncoding + { + get { return m_subjectEncoding; } + set { m_subjectEncoding = value; } + } + + /// + /// Gets or sets the body encoding to be used. + /// + /// + /// The default encoding is the operating system's current ANSI codepage. + /// + public Encoding BodyEncoding + { + get { return m_bodyEncoding; } + set { m_bodyEncoding = value; } + } + #endregion // Public Instance Properties #region Override implementation of BufferingAppenderSkeleton @@ -448,6 +473,7 @@ namespace log4net.Appender using (MailMessage mailMessage = new MailMessage()) { mailMessage.Body = messageBody; + mailMessage.BodyEncoding = m_bodyEncoding; mailMessage.From = new MailAddress(m_from); mailMessage.To.Add(m_to); if (!String.IsNullOrEmpty(m_cc)) @@ -469,6 +495,7 @@ namespace log4net.Appender #endif } mailMessage.Subject = m_subject; + mailMessage.SubjectEncoding = m_subjectEncoding; mailMessage.Priority = m_mailPriority; // TODO: Consider using SendAsync to send the message without blocking. This would be a change in @@ -480,6 +507,7 @@ namespace log4net.Appender MailMessage mailMessage = new MailMessage(); mailMessage.Body = messageBody; + mailMessage.BodyEncoding = m_bodyEncoding; mailMessage.From = m_from; mailMessage.To = m_to; if (m_cc != null && m_cc.Length > 0) @@ -491,6 +519,7 @@ namespace log4net.Appender mailMessage.Bcc = m_bcc; } mailMessage.Subject = m_subject; + mailMessage.SubjectEncoding = m_subjectEncoding; mailMessage.Priority = m_mailPriority; #if NET_1_1 @@ -548,7 +577,7 @@ namespace log4net.Appender SmtpMail.Send(mailMessage); #endif // if NET_2_0 -} + } #endregion // Protected Methods @@ -560,6 +589,8 @@ namespace log4net.Appender private string m_from; private string m_subject; private string m_smtpHost; + private Encoding m_subjectEncoding = Encoding.Default; + private Encoding m_bodyEncoding = Encoding.Default; // authentication fields private SmtpAuthentication m_authentication = SmtpAuthentication.None;
svn commit: r1489819 - /logging/log4net/trunk/src/Config/XmlConfigurator.cs
Author: dpsenner Date: Wed Jun 5 11:40:52 2013 New Revision: 1489819 URL: http://svn.apache.org/r1489819 Log: LOG4NET-335 fix InternalConfigureAndWatch to allow exactly one watch handler for every config file instead of one watch handler for every repository Modified: logging/log4net/trunk/src/Config/XmlConfigurator.cs Modified: logging/log4net/trunk/src/Config/XmlConfigurator.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Config/XmlConfigurator.cs?rev=1489819&r1=1489818&r2=1489819&view=diff == --- logging/log4net/trunk/src/Config/XmlConfigurator.cs (original) +++ logging/log4net/trunk/src/Config/XmlConfigurator.cs Wed Jun 5 11:40:52 2013 @@ -880,18 +880,18 @@ namespace log4net.Config { // support multiple repositories each having their own watcher ConfigureAndWatchHandler handler = - (ConfigureAndWatchHandler)m_repositoryName2ConfigAndWatchHandler[repository.Name]; + (ConfigureAndWatchHandler)m_repositoryName2ConfigAndWatchHandler[configFile.FullName]; if (handler != null) { - m_repositoryName2ConfigAndWatchHandler.Remove(repository.Name); + m_repositoryName2ConfigAndWatchHandler.Remove(configFile.FullName); handler.Dispose(); } // Create and start a watch handler that will reload the // configuration whenever the config file is modified. handler = new ConfigureAndWatchHandler(repository, configFile); - m_repositoryName2ConfigAndWatchHandler[repository.Name] = handler; + m_repositoryName2ConfigAndWatchHandler[configFile.FullName] = handler; } } catch(Exception ex)