You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by dp...@apache.org on 2017/10/31 19:03:24 UTC
[01/12] logging-log4net git commit: Reformat hierarchy class
Repository: logging-log4net
Updated Branches:
refs/heads/develop 56a120517 -> 33d074993
Reformat hierarchy class
Relates to LOG4NET-580.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f6929652
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f6929652
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f6929652
Branch: refs/heads/develop
Commit: f6929652ff1fa0dd98beee5f13226ce29e63cefd
Parents: 56a1205
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 14:42:04 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 14:42:24 2017 +0100
----------------------------------------------------------------------
src/Repository/Hierarchy/Hierarchy.cs | 42 +++++++++++++++---------------
1 file changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f6929652/src/Repository/Hierarchy/Hierarchy.cs
----------------------------------------------------------------------
diff --git a/src/Repository/Hierarchy/Hierarchy.cs b/src/Repository/Hierarchy/Hierarchy.cs
index c45a56a..7d71872 100644
--- a/src/Repository/Hierarchy/Hierarchy.cs
+++ b/src/Repository/Hierarchy/Hierarchy.cs
@@ -21,7 +21,6 @@ using System;
using System.Collections;
using log4net.Appender;
using log4net.Core;
-using log4net.Repository;
using log4net.Util;
namespace log4net.Repository.Hierarchy
@@ -236,7 +235,7 @@ namespace log4net.Repository.Hierarchy
{
if (m_root == null)
{
- lock(this)
+ lock (this)
{
if (m_root == null)
{
@@ -297,7 +296,7 @@ namespace log4net.Repository.Hierarchy
throw new ArgumentNullException("name");
}
- lock(m_ht)
+ lock (m_ht)
{
return m_ht[new LoggerKey(name)] as Logger;
}
@@ -319,12 +318,12 @@ namespace log4net.Repository.Hierarchy
// The accumulation in loggers is necessary because not all elements in
// ht are Logger objects as there might be some ProvisionNodes
// as well.
- lock(m_ht)
+ lock (m_ht)
{
System.Collections.ArrayList loggers = new System.Collections.ArrayList(m_ht.Count);
// Iterate through m_ht values
- foreach(object node in m_ht.Values)
+ foreach (object node in m_ht.Values)
{
if (node is Logger)
{
@@ -385,16 +384,16 @@ namespace log4net.Repository.Hierarchy
/// </remarks>
override public void Shutdown()
{
- LogLog.Debug(declaringType, "Shutdown called on Hierarchy ["+this.Name+"]");
+ LogLog.Debug(declaringType, "Shutdown called on Hierarchy [" + this.Name + "]");
// begin by closing nested appenders
Root.CloseNestedAppenders();
- lock(m_ht)
+ lock (m_ht)
{
ILogger[] currentLoggers = this.GetCurrentLoggers();
- foreach(Logger logger in currentLoggers)
+ foreach (Logger logger in currentLoggers)
{
logger.CloseNestedAppenders();
}
@@ -402,7 +401,7 @@ namespace log4net.Repository.Hierarchy
// then, remove all appenders
Root.RemoveAllAppenders();
- foreach(Logger logger in currentLoggers)
+ foreach (Logger logger in currentLoggers)
{
logger.RemoveAllAppenders();
}
@@ -437,11 +436,11 @@ namespace log4net.Repository.Hierarchy
Threshold = LevelMap.LookupWithDefault(Level.All);
// the synchronization is needed to prevent hashtable surprises
- lock(m_ht)
+ lock (m_ht)
{
Shutdown(); // nested locks are OK
- foreach(Logger l in this.GetCurrentLoggers())
+ foreach (Logger l in this.GetCurrentLoggers())
{
l.Level = null;
l.Additivity = true;
@@ -500,7 +499,7 @@ namespace log4net.Repository.Hierarchy
CollectAppenders(appenderList, Root);
- foreach(Logger logger in GetCurrentLoggers())
+ foreach (Logger logger in GetCurrentLoggers())
{
CollectAppenders(appenderList, logger);
}
@@ -539,7 +538,7 @@ namespace log4net.Repository.Hierarchy
/// <param name="container"></param>
private static void CollectAppenders(System.Collections.ArrayList appenderList, IAppenderAttachable container)
{
- foreach(Appender.IAppender appender in container.Appenders)
+ foreach (Appender.IAppender appender in container.Appenders)
{
CollectAppender(appenderList, appender);
}
@@ -700,7 +699,7 @@ namespace log4net.Repository.Hierarchy
/// </remarks>
public void Clear()
{
- lock(m_ht)
+ lock (m_ht)
{
m_ht.Clear();
}
@@ -738,7 +737,7 @@ namespace log4net.Repository.Hierarchy
// GetEffectiveLevel() method) are possible only if variable
// assignments are non-atomic.
- lock(m_ht)
+ lock (m_ht)
{
Logger logger = null;
@@ -842,7 +841,7 @@ namespace log4net.Repository.Hierarchy
bool parentFound = false;
// if name = "w.x.y.z", loop through "w.x.y", "w.x" and "w", but not "w.x.y.z"
- for(int i = name.LastIndexOf('.', length-1); i >= 0; i = name.LastIndexOf('.', i-1))
+ for (int i = name.LastIndexOf('.', length - 1); i >= 0; i = name.LastIndexOf('.', i - 1))
{
string substr = name.Substring(0, i);
@@ -872,11 +871,12 @@ namespace log4net.Repository.Hierarchy
}
else
{
- LogLog.Error(declaringType, "Unexpected object type ["+node.GetType()+"] in ht.", new LogException());
+ LogLog.Error(declaringType, "Unexpected object type [" + node.GetType() + "] in ht.", new LogException());
}
}
}
- if (i == 0) {
+ if (i == 0)
+ {
// logger name starts with a dot
// and we've hit the start
break;
@@ -916,7 +916,7 @@ namespace log4net.Repository.Hierarchy
/// </remarks>
private static void UpdateChildren(ProvisionNode pn, Logger log)
{
- for(int i = 0; i < pn.Count; i++)
+ for (int i = 0; i < pn.Count; i++)
{
Logger childLogger = (Logger)pn[i];
@@ -953,7 +953,7 @@ namespace log4net.Repository.Hierarchy
Level previousLevel = LevelMap[levelEntry.Name];
if (previousLevel == null)
{
- throw new InvalidOperationException("Cannot redefine level ["+levelEntry.Name+"] because it is not defined in the LevelMap. To define the level supply the level value.");
+ throw new InvalidOperationException("Cannot redefine level [" + levelEntry.Name + "] because it is not defined in the LevelMap. To define the level supply the level value.");
}
levelEntry.Value = previousLevel.Value;
@@ -1031,7 +1031,7 @@ namespace log4net.Repository.Hierarchy
/// <returns>string info about this object</returns>
public override string ToString()
{
- return "LevelEntry(Value="+m_levelValue+", Name="+m_levelName+", DisplayName="+m_levelDisplayName+")";
+ return "LevelEntry(Value=" + m_levelValue + ", Name=" + m_levelName + ", DisplayName=" + m_levelDisplayName + ")";
}
}
[04/12] logging-log4net git commit: Replace nameof() with the
argument name because older compilers do not know that new keyword yet
Posted by dp...@apache.org.
Replace nameof() with the argument name because older compilers do not know that new keyword yet
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/a13c9eae
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/a13c9eae
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/a13c9eae
Branch: refs/heads/develop
Commit: a13c9eaeaa7e36364dea215b10de3a7f6b0ed9c7
Parents: b0729e2
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 15:40:48 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 15:40:48 2017 +0100
----------------------------------------------------------------------
src/Repository/Hierarchy/Hierarchy.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/a13c9eae/src/Repository/Hierarchy/Hierarchy.cs
----------------------------------------------------------------------
diff --git a/src/Repository/Hierarchy/Hierarchy.cs b/src/Repository/Hierarchy/Hierarchy.cs
index 7658674..340604c 100644
--- a/src/Repository/Hierarchy/Hierarchy.cs
+++ b/src/Repository/Hierarchy/Hierarchy.cs
@@ -734,12 +734,12 @@ namespace log4net.Repository.Hierarchy
if (name == string.Empty)
{
- throw new ArgumentException(nameof(name), "Invalid logger name: a logger name must not be empty.");
+ throw new ArgumentException("name", "Invalid logger name: a logger name must not be empty.");
}
if (name != name.Trim())
{
- throw new ArgumentException(nameof(name), "Invalid logger name: a logger name must not be prefixed or suffixed by whitespaces.");
+ throw new ArgumentException("name", "Invalid logger name: a logger name must not be prefixed or suffixed by whitespaces.");
}
LoggerKey key = new LoggerKey(name);
[02/12] logging-log4net git commit: Add validation for logger names
Posted by dp...@apache.org.
Add validation for logger names
* a logger name must not be null or empty
* a logger name must not be prefixed or suffixed by whitespaces
* each part of a logger name split by a dot must not be null or empty
* each part of a logger name split by a dot must not be prefixed or suffixed by whitespaces
This change relates to LOG4NET-580.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/3c4de1c2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/3c4de1c2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/3c4de1c2
Branch: refs/heads/develop
Commit: 3c4de1c2337bbee0b44ef4e3dfded56aff6a2218
Parents: f692965
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 14:58:00 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 15:04:26 2017 +0100
----------------------------------------------------------------------
src/Repository/Hierarchy/Hierarchy.cs | 42 ++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/3c4de1c2/src/Repository/Hierarchy/Hierarchy.cs
----------------------------------------------------------------------
diff --git a/src/Repository/Hierarchy/Hierarchy.cs b/src/Repository/Hierarchy/Hierarchy.cs
index 7d71872..37965e8 100644
--- a/src/Repository/Hierarchy/Hierarchy.cs
+++ b/src/Repository/Hierarchy/Hierarchy.cs
@@ -726,11 +726,22 @@ namespace log4net.Repository.Hierarchy
{
throw new ArgumentNullException("name");
}
+
if (factory == null)
{
throw new ArgumentNullException("factory");
}
+ if (name == string.Empty)
+ {
+ throw new ArgumentException(nameof(name), "Invalid logger name: a logger name must not be empty.");
+ }
+
+ if (name != name.Trim())
+ {
+ throw new ArgumentException(nameof(name), "Invalid logger name: a logger name must not be prefixed or suffixed by whitespaces.");
+ }
+
LoggerKey key = new LoggerKey(name);
// Synchronize to prevent write conflicts. Read conflicts (in
@@ -840,6 +851,37 @@ namespace log4net.Repository.Hierarchy
int length = name.Length;
bool parentFound = false;
+ if (name == null)
+ {
+ throw new ArgumentException(nameof(log), "Invalid logger name: a logger name must not be null.");
+ }
+
+ if (name == string.Empty)
+ {
+ throw new ArgumentException(nameof(log), "Invalid logger name: a logger name must not be empty.");
+ }
+
+ if (name != name.Trim())
+ {
+ throw new ArgumentException(nameof(log), "Invalid logger name: a logger name must not be prefixed or suffixed with whitespaces.");
+ }
+
+ string[] nameParts = name.Split('.');
+ for (int i = 0; i < nameParts.Length; i++)
+ {
+ string namePart = nameParts[i];
+
+ if (namePart == string.Empty)
+ {
+ throw new ArgumentException(nameof(log), "Invalid logger name: a logger name must not contain a substring of two dots or more.");
+ }
+
+ if (namePart != namePart.Trim())
+ {
+ throw new ArgumentException(nameof(log), "Invalid logger name: each part in a logger name when split by a dot must not be prefixed or suffixed with whitespaces.");
+ }
+ }
+
// if name = "w.x.y.z", loop through "w.x.y", "w.x" and "w", but not "w.x.y.z"
for (int i = name.LastIndexOf('.', length - 1); i >= 0; i = name.LastIndexOf('.', i - 1))
{
[09/12] logging-log4net git commit: Refactor: restore stripped using
Posted by dp...@apache.org.
Refactor: restore stripped using
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/af33f424
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/af33f424
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/af33f424
Branch: refs/heads/develop
Commit: af33f424b1feb911ed143c0679c1d41c477756a0
Parents: 88a7cb8
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 17:26:04 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 17:26:04 2017 +0100
----------------------------------------------------------------------
tests/src/Hierarchy/Hierarchy.cs | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/af33f424/tests/src/Hierarchy/Hierarchy.cs
----------------------------------------------------------------------
diff --git a/tests/src/Hierarchy/Hierarchy.cs b/tests/src/Hierarchy/Hierarchy.cs
index 36e3ffd..446090f 100644
--- a/tests/src/Hierarchy/Hierarchy.cs
+++ b/tests/src/Hierarchy/Hierarchy.cs
@@ -24,6 +24,7 @@ using System.Xml;
using log4net.Config;
using log4net.Repository;
using log4net.Tests.Appender;
+using NUnit.Framework;
namespace log4net.Tests.Hierarchy
{
[12/12] logging-log4net git commit: Merge remote-tracking branch
'origin/feature/fix-LOG4NET-580' into develop
Posted by dp...@apache.org.
Merge remote-tracking branch 'origin/feature/fix-LOG4NET-580' into develop
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/33d07499
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/33d07499
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/33d07499
Branch: refs/heads/develop
Commit: 33d074993a21cfb8b141c6cf67760a237c5f1107
Parents: 56a1205 f267c63
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 20:03:06 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 20:03:06 2017 +0100
----------------------------------------------------------------------
src/Repository/Hierarchy/Hierarchy.cs | 42 ++++++++++++-------------
tests/src/Hierarchy/Hierarchy.cs | 50 ++++++++++++++++++++++++++++--
tests/src/packages.config | 5 +--
3 files changed, 71 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
[07/12] logging-log4net git commit: Refactor: format hierarchy tests
Posted by dp...@apache.org.
Refactor: format hierarchy tests
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/d53dd61f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/d53dd61f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/d53dd61f
Branch: refs/heads/develop
Commit: d53dd61f3141a2f92d425c1f75228a0017a60b4d
Parents: c439539
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 17:18:27 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 17:18:27 2017 +0100
----------------------------------------------------------------------
tests/src/Hierarchy/Hierarchy.cs | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/d53dd61f/tests/src/Hierarchy/Hierarchy.cs
----------------------------------------------------------------------
diff --git a/tests/src/Hierarchy/Hierarchy.cs b/tests/src/Hierarchy/Hierarchy.cs
index 7c32757..6fc21a7 100644
--- a/tests/src/Hierarchy/Hierarchy.cs
+++ b/tests/src/Hierarchy/Hierarchy.cs
@@ -22,11 +22,8 @@
using System;
using System.Xml;
using log4net.Config;
-using log4net.Core;
using log4net.Repository;
-using log4net.Repository.Hierarchy;
using log4net.Tests.Appender;
-using NUnit.Framework;
namespace log4net.Tests.Hierarchy
{
@@ -100,7 +97,7 @@ namespace log4net.Tests.Hierarchy
}
[Test]
- // LOG4NET-343
+ // LOG4NET-343
public void LoggerNameCanConsistOfASingleDot()
{
XmlDocument log4netConfig = new XmlDocument();
[08/12] logging-log4net git commit: Add test that makes sure a logger
name can end with a dot
Posted by dp...@apache.org.
Add test that makes sure a logger name can end with a dot
This change relates to LOG4NET-580.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/88a7cb8d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/88a7cb8d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/88a7cb8d
Branch: refs/heads/develop
Commit: 88a7cb8d7c672cd8c723c09271c1b8e451e6ef18
Parents: d53dd61
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 17:21:52 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 17:21:52 2017 +0100
----------------------------------------------------------------------
tests/src/Hierarchy/Hierarchy.cs | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/88a7cb8d/tests/src/Hierarchy/Hierarchy.cs
----------------------------------------------------------------------
diff --git a/tests/src/Hierarchy/Hierarchy.cs b/tests/src/Hierarchy/Hierarchy.cs
index 6fc21a7..36e3ffd 100644
--- a/tests/src/Hierarchy/Hierarchy.cs
+++ b/tests/src/Hierarchy/Hierarchy.cs
@@ -143,6 +143,29 @@ namespace log4net.Tests.Hierarchy
}
[Test]
+ // LOG4NET-580
+ public void LoggerNameCanConsistOfANameEndingWithADot()
+ {
+ XmlDocument log4netConfig = new XmlDocument();
+ log4netConfig.LoadXml(@"
+ <log4net>
+ <appender name=""StringAppender"" type=""log4net.Tests.Appender.StringAppender, log4net.Tests"">
+ <layout type=""log4net.Layout.SimpleLayout"" />
+ </appender>
+ <root>
+ <level value=""ALL"" />
+ <appender-ref ref=""StringAppender"" />
+ </root>
+ <logger name=""Name."">
+ <level value=""WARN"" />
+ </logger>
+ </log4net>");
+
+ ILoggerRepository rep = LogManager.CreateRepository(Guid.NewGuid().ToString());
+ XmlConfigurator.Configure(rep, log4netConfig["log4net"]);
+ }
+
+ [Test]
public void LoggerNameCanConsistOfASingleNonDot()
{
XmlDocument log4netConfig = new XmlDocument();
[05/12] logging-log4net git commit: Add test that makes sure a logger
name can start with a dot
Posted by dp...@apache.org.
Add test that makes sure a logger name can start with a dot
This change relates to LOG4NET-580.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/7be796ff
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/7be796ff
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/7be796ff
Branch: refs/heads/develop
Commit: 7be796ffbadce5b18d1aa101e26e0277495cf12f
Parents: a13c9ea
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 17:17:24 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 17:17:24 2017 +0100
----------------------------------------------------------------------
tests/src/Hierarchy/Hierarchy.cs | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/7be796ff/tests/src/Hierarchy/Hierarchy.cs
----------------------------------------------------------------------
diff --git a/tests/src/Hierarchy/Hierarchy.cs b/tests/src/Hierarchy/Hierarchy.cs
index 8c83290..7c32757 100644
--- a/tests/src/Hierarchy/Hierarchy.cs
+++ b/tests/src/Hierarchy/Hierarchy.cs
@@ -123,6 +123,29 @@ namespace log4net.Tests.Hierarchy
}
[Test]
+ // LOG4NET-580
+ public void LoggerNameCanConsistOfANameStartingWithADot()
+ {
+ XmlDocument log4netConfig = new XmlDocument();
+ log4netConfig.LoadXml(@"
+ <log4net>
+ <appender name=""StringAppender"" type=""log4net.Tests.Appender.StringAppender, log4net.Tests"">
+ <layout type=""log4net.Layout.SimpleLayout"" />
+ </appender>
+ <root>
+ <level value=""ALL"" />
+ <appender-ref ref=""StringAppender"" />
+ </root>
+ <logger name="".Name"">
+ <level value=""WARN"" />
+ </logger>
+ </log4net>");
+
+ ILoggerRepository rep = LogManager.CreateRepository(Guid.NewGuid().ToString());
+ XmlConfigurator.Configure(rep, log4netConfig["log4net"]);
+ }
+
+ [Test]
public void LoggerNameCanConsistOfASingleNonDot()
{
XmlDocument log4netConfig = new XmlDocument();
[03/12] logging-log4net git commit: Replace nameof() with the
argument name because older compilers do not know that new keyword yet
Posted by dp...@apache.org.
Replace nameof() with the argument name because older compilers do not know that new keyword yet
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/b0729e2e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/b0729e2e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/b0729e2e
Branch: refs/heads/develop
Commit: b0729e2e4edfbdcb6da77a3462c16d3900a7a80b
Parents: 3c4de1c
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 15:37:26 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 15:37:26 2017 +0100
----------------------------------------------------------------------
src/Repository/Hierarchy/Hierarchy.cs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b0729e2e/src/Repository/Hierarchy/Hierarchy.cs
----------------------------------------------------------------------
diff --git a/src/Repository/Hierarchy/Hierarchy.cs b/src/Repository/Hierarchy/Hierarchy.cs
index 37965e8..7658674 100644
--- a/src/Repository/Hierarchy/Hierarchy.cs
+++ b/src/Repository/Hierarchy/Hierarchy.cs
@@ -853,17 +853,17 @@ namespace log4net.Repository.Hierarchy
if (name == null)
{
- throw new ArgumentException(nameof(log), "Invalid logger name: a logger name must not be null.");
+ throw new ArgumentException("log", "Invalid logger name: a logger name must not be null.");
}
if (name == string.Empty)
{
- throw new ArgumentException(nameof(log), "Invalid logger name: a logger name must not be empty.");
+ throw new ArgumentException("log", "Invalid logger name: a logger name must not be empty.");
}
if (name != name.Trim())
{
- throw new ArgumentException(nameof(log), "Invalid logger name: a logger name must not be prefixed or suffixed with whitespaces.");
+ throw new ArgumentException("log", "Invalid logger name: a logger name must not be prefixed or suffixed with whitespaces.");
}
string[] nameParts = name.Split('.');
@@ -873,12 +873,12 @@ namespace log4net.Repository.Hierarchy
if (namePart == string.Empty)
{
- throw new ArgumentException(nameof(log), "Invalid logger name: a logger name must not contain a substring of two dots or more.");
+ throw new ArgumentException("log", "Invalid logger name: a logger name must not contain a substring of two dots or more.");
}
if (namePart != namePart.Trim())
{
- throw new ArgumentException(nameof(log), "Invalid logger name: each part in a logger name when split by a dot must not be prefixed or suffixed with whitespaces.");
+ throw new ArgumentException("log", "Invalid logger name: each part in a logger name when split by a dot must not be prefixed or suffixed with whitespaces.");
}
}
[06/12] logging-log4net git commit: Swap the arguments passed into
the ArgumentException ctor
Posted by dp...@apache.org.
Swap the arguments passed into the ArgumentException ctor
This change relates to LOG4NET-580.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/c4395397
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/c4395397
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/c4395397
Branch: refs/heads/develop
Commit: c439539719af7d3b3390f46cea87f0e027fe6921
Parents: 7be796f
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 17:18:03 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 17:18:03 2017 +0100
----------------------------------------------------------------------
src/Repository/Hierarchy/Hierarchy.cs | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/c4395397/src/Repository/Hierarchy/Hierarchy.cs
----------------------------------------------------------------------
diff --git a/src/Repository/Hierarchy/Hierarchy.cs b/src/Repository/Hierarchy/Hierarchy.cs
index 340604c..1843d96 100644
--- a/src/Repository/Hierarchy/Hierarchy.cs
+++ b/src/Repository/Hierarchy/Hierarchy.cs
@@ -734,12 +734,12 @@ namespace log4net.Repository.Hierarchy
if (name == string.Empty)
{
- throw new ArgumentException("name", "Invalid logger name: a logger name must not be empty.");
+ throw new ArgumentException("Invalid logger name: a logger name must not be empty.", "name");
}
if (name != name.Trim())
{
- throw new ArgumentException("name", "Invalid logger name: a logger name must not be prefixed or suffixed by whitespaces.");
+ throw new ArgumentException("Invalid logger name: a logger name must not be prefixed or suffixed by whitespaces.", "name");
}
LoggerKey key = new LoggerKey(name);
@@ -853,17 +853,17 @@ namespace log4net.Repository.Hierarchy
if (name == null)
{
- throw new ArgumentException("log", "Invalid logger name: a logger name must not be null.");
+ throw new ArgumentException("Invalid logger name: a logger name must not be null.", "log");
}
if (name == string.Empty)
{
- throw new ArgumentException("log", "Invalid logger name: a logger name must not be empty.");
+ throw new ArgumentException("Invalid logger name: a logger name must not be empty.", "log");
}
if (name != name.Trim())
{
- throw new ArgumentException("log", "Invalid logger name: a logger name must not be prefixed or suffixed with whitespaces.");
+ throw new ArgumentException("Invalid logger name: a logger name must not be prefixed or suffixed with whitespaces.", "log");
}
string[] nameParts = name.Split('.');
@@ -873,12 +873,12 @@ namespace log4net.Repository.Hierarchy
if (namePart == string.Empty)
{
- throw new ArgumentException("log", "Invalid logger name: a logger name must not contain a substring of two dots or more.");
+ throw new ArgumentException("Invalid logger name: a logger name must not contain a substring of two dots or more.", "log");
}
if (namePart != namePart.Trim())
{
- throw new ArgumentException("log", "Invalid logger name: each part in a logger name when split by a dot must not be prefixed or suffixed with whitespaces.");
+ throw new ArgumentException("Invalid logger name: each part in a logger name when split by a dot must not be prefixed or suffixed with whitespaces.", "log");
}
}
[10/12] logging-log4net git commit: Remove validation of logger names
Posted by dp...@apache.org.
Remove validation of logger names
This reverts commit 3c4de1c2337bbee0b44ef4e3dfded56aff6a2218 and relates to LOG4NET-580.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/35e591d6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/35e591d6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/35e591d6
Branch: refs/heads/develop
Commit: 35e591d6f8a6e6ab052253ebcd2f26fb9617b4dd
Parents: af33f42
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 17:32:01 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 17:32:01 2017 +0100
----------------------------------------------------------------------
src/Repository/Hierarchy/Hierarchy.cs | 42 ------------------------------
1 file changed, 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/35e591d6/src/Repository/Hierarchy/Hierarchy.cs
----------------------------------------------------------------------
diff --git a/src/Repository/Hierarchy/Hierarchy.cs b/src/Repository/Hierarchy/Hierarchy.cs
index 1843d96..7d71872 100644
--- a/src/Repository/Hierarchy/Hierarchy.cs
+++ b/src/Repository/Hierarchy/Hierarchy.cs
@@ -726,22 +726,11 @@ namespace log4net.Repository.Hierarchy
{
throw new ArgumentNullException("name");
}
-
if (factory == null)
{
throw new ArgumentNullException("factory");
}
- if (name == string.Empty)
- {
- throw new ArgumentException("Invalid logger name: a logger name must not be empty.", "name");
- }
-
- if (name != name.Trim())
- {
- throw new ArgumentException("Invalid logger name: a logger name must not be prefixed or suffixed by whitespaces.", "name");
- }
-
LoggerKey key = new LoggerKey(name);
// Synchronize to prevent write conflicts. Read conflicts (in
@@ -851,37 +840,6 @@ namespace log4net.Repository.Hierarchy
int length = name.Length;
bool parentFound = false;
- if (name == null)
- {
- throw new ArgumentException("Invalid logger name: a logger name must not be null.", "log");
- }
-
- if (name == string.Empty)
- {
- throw new ArgumentException("Invalid logger name: a logger name must not be empty.", "log");
- }
-
- if (name != name.Trim())
- {
- throw new ArgumentException("Invalid logger name: a logger name must not be prefixed or suffixed with whitespaces.", "log");
- }
-
- string[] nameParts = name.Split('.');
- for (int i = 0; i < nameParts.Length; i++)
- {
- string namePart = nameParts[i];
-
- if (namePart == string.Empty)
- {
- throw new ArgumentException("Invalid logger name: a logger name must not contain a substring of two dots or more.", "log");
- }
-
- if (namePart != namePart.Trim())
- {
- throw new ArgumentException("Invalid logger name: each part in a logger name when split by a dot must not be prefixed or suffixed with whitespaces.", "log");
- }
- }
-
// if name = "w.x.y.z", loop through "w.x.y", "w.x" and "w", but not "w.x.y.z"
for (int i = name.LastIndexOf('.', length - 1); i >= 0; i = name.LastIndexOf('.', i - 1))
{
[11/12] logging-log4net git commit: Add reference to the nunit test
adapter package so that visual studio test explorer finds the tests
Posted by dp...@apache.org.
Add reference to the nunit test adapter package so that visual studio test explorer finds the tests
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f267c638
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f267c638
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f267c638
Branch: refs/heads/develop
Commit: f267c638d805fc35d72d06369d4bab96c5100989
Parents: 35e591d
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 17:36:07 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 17:36:07 2017 +0100
----------------------------------------------------------------------
tests/src/packages.config | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f267c638/tests/src/packages.config
----------------------------------------------------------------------
diff --git a/tests/src/packages.config b/tests/src/packages.config
index e594870..bddd01c 100644
--- a/tests/src/packages.config
+++ b/tests/src/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -17,4 +17,5 @@ limitations under the License.
-->
<packages>
<package id="NUnit" version="2.6.4" targetFramework="net4" />
-</packages>
+ <package id="NUnitTestAdapter" version="2.1.1" targetFramework="net45" />
+</packages>
\ No newline at end of file