logging-log4net-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject cvs commit: logging-log4net/src/Util/PatternStringConverters IdentityPatternConverter.cs ProcessIdPatternConverter.cs UserNamePatternConverter.cs
Date Sun, 19 Dec 2004 19:49:14 GMT
nicko       2004/12/19 11:49:14

  Modified:    src/Appender AdoNetAppender.cs
               src/Config BasicConfigurator.cs XmlConfigurator.cs
               src/Core LoggerManager.cs
               src/Layout/Pattern NamedPatternConverter.cs
               src/Repository/Hierarchy Hierarchy.cs
                        XmlHierarchyConfigurator.cs
               src/Util PatternParser.cs
               src/Util/PatternStringConverters IdentityPatternConverter.cs
                        ProcessIdPatternConverter.cs
                        UserNamePatternConverter.cs
  Log:
  Cleaned up internal log messages
  
  Revision  Changes    Path
  1.10      +1 -1      logging-log4net/src/Appender/AdoNetAppender.cs
  
  Index: AdoNetAppender.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Appender/AdoNetAppender.cs,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AdoNetAppender.cs	19 Dec 2004 19:21:55 -0000	1.9
  +++ AdoNetAppender.cs	19 Dec 2004 19:49:13 -0000	1.10
  @@ -535,7 +535,7 @@
   						// Get the command text from the Layout
   						string logStatement = GetLogStatement(e);
   
  -						LogLog.Debug("ADOAppender: LogStatement ["+logStatement+"]");
  +						LogLog.Debug("AdoNetAppender: LogStatement ["+logStatement+"]");
   
   						dbCmd.CommandText = logStatement;
   						dbCmd.ExecuteNonQuery();
  
  
  
  1.8       +1 -1      logging-log4net/src/Config/BasicConfigurator.cs
  
  Index: BasicConfigurator.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Config/BasicConfigurator.cs,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BasicConfigurator.cs	19 Dec 2004 19:22:30 -0000	1.7
  +++ BasicConfigurator.cs	19 Dec 2004 19:49:13 -0000	1.8
  @@ -144,7 +144,7 @@
   			}
   			else
   			{
  -				LogLog.Warn("Repository [" + repository + "] does not support the BasicConfigurator");
  +				LogLog.Warn("BasicConfigurator: Repository [" + repository + "] does not support the
BasicConfigurator");
   			}
   		}
   
  
  
  
  1.11      +2 -2      logging-log4net/src/Config/XmlConfigurator.cs
  
  Index: XmlConfigurator.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Config/XmlConfigurator.cs,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- XmlConfigurator.cs	19 Dec 2004 19:22:41 -0000	1.10
  +++ XmlConfigurator.cs	19 Dec 2004 19:49:13 -0000	1.11
  @@ -627,7 +627,7 @@
   				}
   				catch(Exception ex)
   				{
  -					LogLog.Error("Failed to initialize configuration file watcher for file ["+configFile.FullName+"]",
ex);
  +					LogLog.Error("XmlConfigurator: Failed to initialize configuration file watcher for
file ["+configFile.FullName+"]", ex);
   				}
   			}
   		}
  @@ -814,7 +814,7 @@
   				IXmlRepositoryConfigurator configurableRepository = repository as IXmlRepositoryConfigurator;
   				if (configurableRepository == null)
   				{
  -					LogLog.Warn("Repository [" + repository + "] does not support the XmlConfigurator");
  +					LogLog.Warn("XmlConfigurator: Repository [" + repository + "] does not support the
XmlConfigurator");
   				}
   				else
   				{
  
  
  
  1.7       +1 -1      logging-log4net/src/Core/LoggerManager.cs
  
  Index: LoggerManager.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Core/LoggerManager.cs,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LoggerManager.cs	6 Dec 2004 02:20:06 -0000	1.6
  +++ LoggerManager.cs	19 Dec 2004 19:49:14 -0000	1.7
  @@ -80,7 +80,7 @@
   			}
   			catch(System.Security.SecurityException)
   			{
  -				LogLog.Debug("Security Exception (ControlAppDomain LinkDemand) while trying "+
  +				LogLog.Debug("LoggerMAnager: Security Exception (ControlAppDomain LinkDemand) while
trying "+
   					"to register Shutdown handler with the AppDomain. LoggerManager.Shutdown() "+
   					"will not be called automatically when the AppDomain exits. It must be called "+
   					"programmatically.");
  
  
  
  1.5       +2 -2      logging-log4net/src/Layout/Pattern/NamedPatternConverter.cs
  
  Index: NamedPatternConverter.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Layout/Pattern/NamedPatternConverter.cs,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NamedPatternConverter.cs	6 Dec 2004 02:22:44 -0000	1.4
  +++ NamedPatternConverter.cs	19 Dec 2004 19:49:14 -0000	1.5
  @@ -83,13 +83,13 @@
   						m_precision = int.Parse(optStr, NumberFormatInfo.InvariantInfo);
   						if (m_precision <= 0) 
   						{
  -							LogLog.Error("Precision option (" + optStr + ") isn't a positive integer.");
  +							LogLog.Error("NamedPatternConverter: Precision option (" + optStr + ") isn't a positive
integer.");
   							m_precision = 0;
   						}
   					} 
   					catch (Exception e) 
   					{
  -						LogLog.Error("Precision option \"" + optStr + "\" not a decimal integer.", e);
  +						LogLog.Error("NamedPatternConverter: Precision option \"" + optStr + "\" not a decimal
integer.", e);
   						m_precision = 0;
   					}
   				}
  
  
  
  1.13      +9 -5      logging-log4net/src/Repository/Hierarchy/Hierarchy.cs
  
  Index: Hierarchy.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Repository/Hierarchy/Hierarchy.cs,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Hierarchy.cs	19 Dec 2004 19:24:00 -0000	1.12
  +++ Hierarchy.cs	19 Dec 2004 19:49:14 -0000	1.13
  @@ -377,22 +377,26 @@
   		/// </remarks>
   		override public void Shutdown() 
   		{
  +			LogLog.Debug("Hierarchy: Shutdown called on Hierarchy ["+this.Name+"]");
  +
   			// begin by closing nested appenders
   			Root.CloseNestedAppenders();
   
   			lock(m_ht) 
   			{
  -				foreach(Logger l in this.GetCurrentLoggers())
  +				ILogger[] currentLoggers = this.GetCurrentLoggers();
  +
  +				foreach(Logger logger in currentLoggers)
   				{
  -					l.CloseNestedAppenders();
  +					logger.CloseNestedAppenders();
   				}
   
   				// then, remove all appenders
   				Root.RemoveAllAppenders();
   
  -				foreach(Logger l in this.GetCurrentLoggers())
  +				foreach(Logger logger in currentLoggers)
   				{
  -					l.RemoveAllAppenders();
  +					logger.RemoveAllAppenders();
   				}
   			}
   
  @@ -825,7 +829,7 @@
   						}
   						else
   						{
  -							LogLog.Error("unexpected object type ["+node.GetType()+"] in ht.", new LogException());
  +							LogLog.Error("Hierarchy: Unexpected object type ["+node.GetType()+"] in ht.", new
LogException());
   						}
   					} 
   				} 
  
  
  
  1.15      +50 -50    logging-log4net/src/Repository/Hierarchy/XmlHierarchyConfigurator.cs
  
  Index: XmlHierarchyConfigurator.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Repository/Hierarchy/XmlHierarchyConfigurator.cs,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- XmlHierarchyConfigurator.cs	19 Dec 2004 19:24:07 -0000	1.14
  +++ XmlHierarchyConfigurator.cs	19 Dec 2004 19:49:14 -0000	1.15
  @@ -91,7 +91,7 @@
   
   			if (rootElementName != CONFIGURATION_TAG)
   			{
  -				LogLog.Error("XmlConfigurator: Xml element is - not a <" + CONFIGURATION_TAG + ">
element.");
  +				LogLog.Error("XmlHierarchyConfigurator: Xml element is - not a <" + CONFIGURATION_TAG
+ "> element.");
   				return;
   			}
   
  @@ -99,7 +99,7 @@
   			{
   				// Look for a debug attribute to enable internal debug
   				string debugAttribute = element.GetAttribute(INTERNAL_DEBUG_ATTR);
  -				LogLog.Debug("XmlConfigurator: "+INTERNAL_DEBUG_ATTR+" attribute [" + debugAttribute
+ "].");
  +				LogLog.Debug("XmlHierarchyConfigurator: "+INTERNAL_DEBUG_ATTR+" attribute [" + debugAttribute
+ "].");
   
   				if (debugAttribute.Length>0 && debugAttribute != "null") 
   				{	  
  @@ -107,14 +107,14 @@
   				}
   				else 
   				{
  -					LogLog.Debug("XmlConfigurator: Ignoring " + INTERNAL_DEBUG_ATTR + " attribute.");
  +					LogLog.Debug("XmlHierarchyConfigurator: Ignoring " + INTERNAL_DEBUG_ATTR + " attribute.");
   				}
   
   				string confDebug = element.GetAttribute(CONFIG_DEBUG_ATTR);
   				if (confDebug.Length>0 && confDebug != "null")
   				{	  
  -					LogLog.Warn("XmlConfigurator: The \"" + CONFIG_DEBUG_ATTR + "\" attribute is deprecated.");
  -					LogLog.Warn("XmlConfigurator: Use the \"" + INTERNAL_DEBUG_ATTR + "\" attribute instead.");
  +					LogLog.Warn("XmlHierarchyConfigurator: The \"" + CONFIG_DEBUG_ATTR + "\" attribute
is deprecated.");
  +					LogLog.Warn("XmlHierarchyConfigurator: Use the \"" + INTERNAL_DEBUG_ATTR + "\" attribute
instead.");
   					LogLog.InternalDebugging = OptionConverter.ToBoolean(confDebug, true);
   				}
   			}
  @@ -133,14 +133,14 @@
   				}
   				catch
   				{
  -					LogLog.Error("XmlConfigurator: Invalid " + CONFIG_UPDATE_MODE_ATTR + " attribute value
[" + configUpdateModeAttribute + "]");
  +					LogLog.Error("XmlHierarchyConfigurator: Invalid " + CONFIG_UPDATE_MODE_ATTR + " attribute
value [" + configUpdateModeAttribute + "]");
   				}
   			}
   
   #if (!NETCF)
  -			LogLog.Debug("XmlConfigurator: Configuration update mode [" + configUpdateMode.ToString(CultureInfo.InvariantCulture)
+ "].");
  +			LogLog.Debug("XmlHierarchyConfigurator: Configuration update mode [" + configUpdateMode.ToString(CultureInfo.InvariantCulture)
+ "].");
   #else
  -			LogLog.Debug("XmlConfigurator: Configuration update mode [" + configUpdateMode.ToString()
+ "].");
  +			LogLog.Debug("XmlHierarchyConfigurator: Configuration update mode [" + configUpdateMode.ToString()
+ "].");
   #endif
   
   			// Only reset configuration if overwrite flag specified
  @@ -148,7 +148,7 @@
   			{
   				// Reset to original unset configuration
   				m_hierarchy.ResetConfiguration();
  -				LogLog.Debug("XmlConfigurator: Configuration reset before reading config.");
  +				LogLog.Debug("XmlHierarchyConfigurator: Configuration reset before reading config.");
   			}
   
   			/* Building Appender objects, placing them in a local namespace
  @@ -194,7 +194,7 @@
   
   			// Lastly set the hierarchy threshold
   			string thresholdStr = element.GetAttribute(THRESHOLD_ATTR);
  -			LogLog.Debug("XmlConfigurator: Hierarchy Threshold [" + thresholdStr + "]");
  +			LogLog.Debug("XmlHierarchyConfigurator: Hierarchy Threshold [" + thresholdStr + "]");
   			if (thresholdStr.Length > 0 && thresholdStr != "null") 
   			{
   				Level thresholdLevel = (Level) ConvertStringTo(typeof(Level), thresholdStr);
  @@ -204,7 +204,7 @@
   				}
   				else
   				{
  -					LogLog.Warn("XmlConfigurator: Unable to set hierarchy threshold using value [" + thresholdStr
+ "] (with acceptable conversion types)");
  +					LogLog.Warn("XmlHierarchyConfigurator: Unable to set hierarchy threshold using value
[" + thresholdStr + "] (with acceptable conversion types)");
   				}
   			}
   
  @@ -254,7 +254,7 @@
   
   				if (element == null) 
   				{
  -					LogLog.Error("XmlConfigurator: No appender named [" + appenderName + "] could be found.");

  +					LogLog.Error("XmlHierarchyConfigurator: No appender named [" + appenderName + "] could
be found."); 
   					return null;
   				} 
   				else
  @@ -285,7 +285,7 @@
   			string appenderName = appenderElement.GetAttribute(NAME_ATTR);
   			string typeName = appenderElement.GetAttribute(TYPE_ATTR);
   
  -			LogLog.Debug("XmlConfigurator: Loading Appender [" + appenderName + "] type: [" + typeName
+ "]");
  +			LogLog.Debug("XmlHierarchyConfigurator: Loading Appender [" + appenderName + "] type:
[" + typeName + "]");
   			try 
   			{
   				IAppender appender = (IAppender)Activator.CreateInstance(SystemInfo.GetTypeFromString(typeName,
true, true));
  @@ -306,7 +306,7 @@
   							IAppenderAttachable appenderContainer = appender as IAppenderAttachable;
   							if (appenderContainer != null) 
   							{
  -								LogLog.Debug("XmlConfigurator: Attaching appender named [" + refName + "] to appender
named [" + appender.Name + "].");
  +								LogLog.Debug("XmlHierarchyConfigurator: Attaching appender named [" + refName +
"] to appender named [" + appender.Name + "].");
   
   								IAppender referencedAppender = FindAppenderByReference(currentElement);
   								if (referencedAppender != null)
  @@ -316,7 +316,7 @@
   							} 
   							else 
   							{
  -								LogLog.Error("XmlConfigurator: Requesting attachment of appender named ["+refName+
"] to appender named [" + appender.Name + "] which does not implement log4net.Core.IAppenderAttachable.");
  +								LogLog.Error("XmlHierarchyConfigurator: Requesting attachment of appender named
["+refName+ "] to appender named [" + appender.Name + "] which does not implement log4net.Core.IAppenderAttachable.");
   							}
   						}
   						else
  @@ -333,14 +333,14 @@
   					optionHandler.ActivateOptions();
   				}
   
  -				LogLog.Debug("XmlConfigurator: Created Appender [" + appenderName + "]");	
  +				LogLog.Debug("XmlHierarchyConfigurator: Created Appender [" + appenderName + "]");

   				return appender;
   			}
   			catch (Exception ex) 
   			{
   				// Yes, it's ugly.  But all exceptions point to the same problem: we can't create an
Appender
   
  -				LogLog.Error("XmlConfigurator: Could not create Appender [" + appenderName + "] of
type [" + typeName + "]. Reported error follows.", ex);
  +				LogLog.Error("XmlHierarchyConfigurator: Could not create Appender [" + appenderName
+ "] of type [" + typeName + "]. Reported error follows.", ex);
   				return null;
   			}
   		}
  @@ -359,7 +359,7 @@
   			// Create a new log4net.Logger object from the <logger> element.
   			string loggerName = loggerElement.GetAttribute(NAME_ATTR);
   
  -			LogLog.Debug("XmlConfigurator: Retrieving an instance of log4net.Repository.Logger for
logger [" + loggerName + "].");
  +			LogLog.Debug("XmlHierarchyConfigurator: Retrieving an instance of log4net.Repository.Logger
for logger [" + loggerName + "].");
   			Logger log = m_hierarchy.GetLogger(loggerName) as Logger;
   
   			// Setting up a logger needs to be an atomic operation, in order
  @@ -369,7 +369,7 @@
   			{
   				bool additivity = OptionConverter.ToBoolean(loggerElement.GetAttribute(ADDITIVITY_ATTR),
true);
   	
  -				LogLog.Debug("XmlConfigurator: Setting [" + log.Name + "] additivity to [" + additivity
+ "].");
  +				LogLog.Debug("XmlHierarchyConfigurator: Setting [" + log.Name + "] additivity to ["
+ additivity + "].");
   				log.Additivity = additivity;
   				ParseChildrenOfLoggerElement(loggerElement, log, false);
   			}
  @@ -423,12 +423,12 @@
   						string refName =  currentElement.GetAttribute(REF_ATTR);
   						if (appender != null)
   						{
  -							LogLog.Debug("XmlConfigurator: Adding appender named [" + refName + "] to logger
[" + log.Name + "].");
  +							LogLog.Debug("XmlHierarchyConfigurator: Adding appender named [" + refName + "]
to logger [" + log.Name + "].");
   							log.AddAppender(appender);
   						}
   						else 
   						{
  -							LogLog.Error("XmlConfigurator: Appender named [" + refName + "] not found.");
  +							LogLog.Error("XmlHierarchyConfigurator: Appender named [" + refName + "] not found.");
   						}
   					} 
   					else if (currentElement.LocalName == LEVEL_TAG || currentElement.LocalName == PRIORITY_TAG)

  @@ -463,11 +463,11 @@
   			string renderingClassName = element.GetAttribute(RENDERING_TYPE_ATTR);
   			string renderedClassName = element.GetAttribute(RENDERED_TYPE_ATTR);
   
  -			LogLog.Debug("XmlConfigurator: Rendering class [" + renderingClassName + "], Rendered
class [" + renderedClassName + "].");
  +			LogLog.Debug("XmlHierarchyConfigurator: Rendering class [" + renderingClassName + "],
Rendered class [" + renderedClassName + "].");
   			IObjectRenderer renderer = (IObjectRenderer)OptionConverter.InstantiateByClassName(renderingClassName,
typeof(IObjectRenderer), null);
   			if (renderer == null) 
   			{
  -				LogLog.Error("XmlConfigurator: Could not instantiate renderer [" + renderingClassName
+ "].");
  +				LogLog.Error("XmlHierarchyConfigurator: Could not instantiate renderer [" + renderingClassName
+ "].");
   				return;
   			} 
   			else 
  @@ -478,7 +478,7 @@
   				} 
   				catch(Exception e) 
   				{
  -					LogLog.Error("XmlConfigurator: Could not find class [" + renderedClassName + "].",
e);
  +					LogLog.Error("XmlHierarchyConfigurator: Could not find class [" + renderedClassName
+ "].", e);
   				}
   			}
   		}
  @@ -503,17 +503,17 @@
   			}
   
   			string levelStr = element.GetAttribute(VALUE_ATTR);
  -			LogLog.Debug("XmlConfigurator: Logger [" + loggerName + "] Level string is [" + levelStr
+ "].");
  +			LogLog.Debug("XmlHierarchyConfigurator: Logger [" + loggerName + "] Level string is
[" + levelStr + "].");
   	
   			if (INHERITED == levelStr) 
   			{
   				if (isRoot) 
   				{
  -					LogLog.Error("XmlConfigurator: Root level cannot be inherited. Ignoring directive.");
  +					LogLog.Error("XmlHierarchyConfigurator: Root level cannot be inherited. Ignoring directive.");
   				} 
   				else 
   				{
  -					LogLog.Debug("XmlConfigurator: Logger [" + loggerName + "] level set to inherit from
parent.");	
  +					LogLog.Debug("XmlHierarchyConfigurator: Logger [" + loggerName + "] level set to inherit
from parent.");	
   					log.Level = null;
   				}
   			} 
  @@ -522,11 +522,11 @@
   				log.Level = log.Hierarchy.LevelMap[levelStr];
   				if (log.Level == null)
   				{
  -					LogLog.Error("XmlConfigurator: Undefined level [" + levelStr + "] on Logger [" + loggerName
+ "].");
  +					LogLog.Error("XmlHierarchyConfigurator: Undefined level [" + levelStr + "] on Logger
[" + loggerName + "].");
   				}
   				else
   				{
  -					LogLog.Debug("XmlConfigurator: Logger [" + loggerName + "] level set to [name=\""
+ log.Level.Name + "\",value=" + log.Level.Value + "].");	
  +					LogLog.Debug("XmlHierarchyConfigurator: Logger [" + loggerName + "] level set to [name=\""
+ log.Level.Name + "\",value=" + log.Level.Value + "].");	
   				}
   			}
   		}
  @@ -587,7 +587,7 @@
   
   			if (propertyType == null)
   			{
  -				LogLog.Error("XmlConfigurator: Cannot find Property [" + name + "] to set object on
[" + target.ToString() + "]");
  +				LogLog.Error("XmlHierarchyConfigurator: Cannot find Property [" + name + "] to set
object on [" + target.ToString() + "]");
   			}
   			else
   			{
  @@ -606,7 +606,7 @@
   						// This security exception will occur if the caller does not have 
   						// unrestricted environment permission. If this occurs the expansion 
   						// will be skipped with the following warning message.
  -						LogLog.Debug("XmlConfigurator: Security exception while trying to expand environment
variables. Error Ignored. No Expansion.");
  +						LogLog.Debug("XmlHierarchyConfigurator: Security exception while trying to expand
environment variables. Error Ignored. No Expansion.");
   					}
   #endif
   
  @@ -621,7 +621,7 @@
   						{
   							Type subType = SystemInfo.GetTypeFromString(subTypeString, true, true);
   
  -							LogLog.Debug("XmlConfigurator: Parameter ["+name+"] specified subtype ["+subType.FullName+"]");
  +							LogLog.Debug("XmlHierarchyConfigurator: Parameter ["+name+"] specified subtype ["+subType.FullName+"]");
   
   							if (!propertyType.IsAssignableFrom(subType))
   							{
  @@ -636,7 +636,7 @@
   								}
   								else
   								{
  -									LogLog.Error("XmlConfigurator: Subtype ["+subType.FullName+"] set on ["+name+"]
is not a subclass of property type ["+propertyType.FullName+"] and there are no acceptable
type conversions.");
  +									LogLog.Error("XmlHierarchyConfigurator: Subtype ["+subType.FullName+"] set on
["+name+"] is not a subclass of property type ["+propertyType.FullName+"] and there are no
acceptable type conversions.");
   								}
   							}
   							else
  @@ -648,7 +648,7 @@
   						}
   						catch(Exception ex)
   						{
  -							LogLog.Error("XmlConfigurator: Failed to find type ["+subTypeString+"] set on ["+name+"]",
ex);
  +							LogLog.Error("XmlHierarchyConfigurator: Failed to find type ["+subTypeString+"]
set on ["+name+"]", ex);
   						}
   					}
   
  @@ -660,7 +660,7 @@
   					// Check if we need to do an additional conversion
   					if (convertedValue != null && parsedObjectConversionTargetType != null)
   					{
  -						LogLog.Debug("XmlConfigurator: Performing additional conversion of value from ["
+ convertedValue.GetType().Name + "] to [" + parsedObjectConversionTargetType.Name + "]");
  +						LogLog.Debug("XmlHierarchyConfigurator: Performing additional conversion of value
from [" + convertedValue.GetType().Name + "] to [" + parsedObjectConversionTargetType.Name
+ "]");
   						convertedValue = OptionConverter.ConvertTypeTo(convertedValue, parsedObjectConversionTargetType);
   					}
   
  @@ -669,7 +669,7 @@
   						if (propInfo != null)
   						{
   							// Got a converted result
  -							LogLog.Debug("XmlConfigurator: Setting Property [" + propInfo.Name + "] to " + convertedValue.GetType().Name
+ " value [" + convertedValue.ToString() + "]");
  +							LogLog.Debug("XmlHierarchyConfigurator: Setting Property [" + propInfo.Name + "]
to " + convertedValue.GetType().Name + " value [" + convertedValue.ToString() + "]");
   
   							try
   							{
  @@ -678,13 +678,13 @@
   							}
   							catch(TargetInvocationException targetInvocationEx)
   							{
  -								LogLog.Error("XmlConfigurator: Failed to set parameter [" + propInfo.Name + "]
on object [" + target + "] using value [" + convertedValue + "]", targetInvocationEx.InnerException);
  +								LogLog.Error("XmlHierarchyConfigurator: Failed to set parameter [" + propInfo.Name
+ "] on object [" + target + "] using value [" + convertedValue + "]", targetInvocationEx.InnerException);
   							}
   						}
   						else if (methInfo != null)
   						{
   							// Got a converted result
  -							LogLog.Debug("XmlConfigurator: Setting Collection Property [" + methInfo.Name +
"] to " + convertedValue.GetType().Name + " value [" + convertedValue.ToString() + "]");
  +							LogLog.Debug("XmlHierarchyConfigurator: Setting Collection Property [" + methInfo.Name
+ "] to " + convertedValue.GetType().Name + " value [" + convertedValue.ToString() + "]");
   
   							try
   							{
  @@ -693,13 +693,13 @@
   							}
   							catch(TargetInvocationException targetInvocationEx)
   							{
  -								LogLog.Error("XmlConfigurator: Failed to set parameter [" + name + "] on object
[" + target + "] using value [" + convertedValue + "]", targetInvocationEx.InnerException);
  +								LogLog.Error("XmlHierarchyConfigurator: Failed to set parameter [" + name + "]
on object [" + target + "] using value [" + convertedValue + "]", targetInvocationEx.InnerException);
   							}
   						}
   					}
   					else
   					{
  -						LogLog.Warn("XmlConfigurator: Unable to set property [" + name + "] on object ["
+ target + "] using value [" + propertyValue + "] (with acceptable conversion types)");
  +						LogLog.Warn("XmlHierarchyConfigurator: Unable to set property [" + name + "] on object
[" + target + "] using value [" + propertyValue + "] (with acceptable conversion types)");
   					}
   				}
   				else
  @@ -715,14 +715,14 @@
   
   					if (createdObject == null)
   					{
  -						LogLog.Error("XmlConfigurator: Failed to create object to set param: "+name);
  +						LogLog.Error("XmlHierarchyConfigurator: Failed to create object to set param: "+name);
   					}
   					else
   					{
   						if (propInfo != null)
   						{
   							// Got a converted result
  -							LogLog.Debug("XmlConfigurator: Setting Property ["+ propInfo.Name +"] to object
["+ createdObject +"]");
  +							LogLog.Debug("XmlHierarchyConfigurator: Setting Property ["+ propInfo.Name +"] to
object ["+ createdObject +"]");
   
   							try
   							{
  @@ -731,13 +731,13 @@
   							}
   							catch(TargetInvocationException targetInvocationEx)
   							{
  -								LogLog.Error("XmlConfigurator: Failed to set parameter [" + propInfo.Name + "]
on object [" + target + "] using value [" + createdObject + "]", targetInvocationEx.InnerException);
  +								LogLog.Error("XmlHierarchyConfigurator: Failed to set parameter [" + propInfo.Name
+ "] on object [" + target + "] using value [" + createdObject + "]", targetInvocationEx.InnerException);
   							}
   						}
   						else if (methInfo != null)
   						{
   							// Got a converted result
  -							LogLog.Debug("XmlConfigurator: Setting Collection Property ["+ methInfo.Name +"]
to object ["+ createdObject +"]");
  +							LogLog.Debug("XmlHierarchyConfigurator: Setting Collection Property ["+ methInfo.Name
+"] to object ["+ createdObject +"]");
   
   							try
   							{
  @@ -746,7 +746,7 @@
   							}
   							catch(TargetInvocationException targetInvocationEx)
   							{
  -								LogLog.Error("XmlConfigurator: Failed to set parameter [" + methInfo.Name + "]
on object [" + target + "] using value [" + createdObject + "]", targetInvocationEx.InnerException);
  +								LogLog.Error("XmlHierarchyConfigurator: Failed to set parameter [" + methInfo.Name
+ "] on object [" + target + "] using value [" + createdObject + "]", targetInvocationEx.InnerException);
   							}
   						}
   					}
  @@ -816,7 +816,7 @@
   
   				if (levelValue == null)
   				{
  -					LogLog.Error("XmlConfigurator: Unknown Level Specified ["+ value +"]");
  +					LogLog.Error("XmlHierarchyConfigurator: Unknown Level Specified ["+ value +"]");
   				}
   
   				return levelValue;
  @@ -853,7 +853,7 @@
   			{
   				if (defaultTargetType == null)
   				{
  -					LogLog.Error("XmlConfigurator: Object type not specified. Cannot create object.");
  +					LogLog.Error("XmlHierarchyConfigurator: Object type not specified. Cannot create object.");
   					return null;
   				}
   				else
  @@ -871,7 +871,7 @@
   				}
   				catch(Exception ex)
   				{
  -					LogLog.Error("XmlConfigurator: Failed to find type ["+objectTypeString+"]", ex);
  +					LogLog.Error("XmlHierarchyConfigurator: Failed to find type ["+objectTypeString+"]",
ex);
   					return null;
   				}
   			}
  @@ -890,7 +890,7 @@
   					}
   					else
   					{
  -						LogLog.Error("XmlConfigurator: Object type ["+objectType.FullName+"] is not assignable
to type ["+typeConstraint.FullName+"]. There are no acceptable type conversions.");
  +						LogLog.Error("XmlHierarchyConfigurator: Object type ["+objectType.FullName+"] is
not assignable to type ["+typeConstraint.FullName+"]. There are no acceptable type conversions.");
   						return null;
   					}
   				}
  @@ -904,7 +904,7 @@
   			}
   			catch(Exception createInstanceEx)
   			{
  -				LogLog.Error("XmlConfigurator: Failed to construct object of type [" + objectType.FullName
+ "] Exception: "+createInstanceEx.ToString());
  +				LogLog.Error("XmlHierarchyConfigurator: Failed to construct object of type [" + objectType.FullName
+ "] Exception: "+createInstanceEx.ToString());
   			}
   
   			// Set any params on object
  
  
  
  1.6       +1 -1      logging-log4net/src/Util/PatternParser.cs
  
  Index: PatternParser.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Util/PatternParser.cs,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PatternParser.cs	19 Dec 2004 19:24:13 -0000	1.5
  +++ PatternParser.cs	19 Dec 2004 19:49:14 -0000	1.6
  @@ -284,7 +284,7 @@
   		/// <param name="formattingInfo">the formatting info for the converter</param>
   		private void ProcessConverter(string converterName, string option, FormattingInfo formattingInfo)
   		{
  -			LogLog.Debug("Converter: ["+converterName+"] Option: ["+option+"] Format: [min="+formattingInfo.Min+",max="+formattingInfo.Max+",leftAlign="+formattingInfo.LeftAlign+"]");
  +			LogLog.Debug("PatternParser: Converter ["+converterName+"] Option ["+option+"] Format
[min="+formattingInfo.Min+",max="+formattingInfo.Max+",leftAlign="+formattingInfo.LeftAlign+"]");
   
   			// Lookup the converter type
   			Type converterType = (Type)m_patternConverters[converterName];
  
  
  
  1.3       +1 -1      logging-log4net/src/Util/PatternStringConverters/IdentityPatternConverter.cs
  
  Index: IdentityPatternConverter.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Util/PatternStringConverters/IdentityPatternConverter.cs,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IdentityPatternConverter.cs	16 Feb 2004 02:10:55 -0000	1.2
  +++ IdentityPatternConverter.cs	19 Dec 2004 19:49:14 -0000	1.3
  @@ -54,7 +54,7 @@
   			{
   				// This security exception will occur if the caller does not have 
   				// some undefined set of SecurityPermission flags.
  -				LogLog.Debug("LoggingEvent: Security exception while trying to get current thread principal.
Error Ignored.");
  +				LogLog.Debug("IdentityPatternConverter: Security exception while trying to get current
thread principal. Error Ignored.");
   
   				writer.Write( "NOT AVAILABLE" );
   			}
  
  
  
  1.3       +1 -1      logging-log4net/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs
  
  Index: ProcessIdPatternConverter.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProcessIdPatternConverter.cs	16 Feb 2004 02:10:55 -0000	1.2
  +++ ProcessIdPatternConverter.cs	19 Dec 2004 19:49:14 -0000	1.3
  @@ -49,7 +49,7 @@
   			{
   				// This security exception will occur if the caller does not have 
   				// some undefined set of SecurityPermission flags.
  -				LogLog.Debug("LoggingEvent: Security exception while trying to get current process
id. Error Ignored.");
  +				LogLog.Debug("ProcessIdPatternConverter: Security exception while trying to get current
process id. Error Ignored.");
   
   				writer.Write( "NOT AVAILABLE" );
   			}
  
  
  
  1.3       +1 -1      logging-log4net/src/Util/PatternStringConverters/UserNamePatternConverter.cs
  
  Index: UserNamePatternConverter.cs
  ===================================================================
  RCS file: /home/cvs/logging-log4net/src/Util/PatternStringConverters/UserNamePatternConverter.cs,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UserNamePatternConverter.cs	16 Feb 2004 02:10:55 -0000	1.2
  +++ UserNamePatternConverter.cs	19 Dec 2004 19:49:14 -0000	1.3
  @@ -54,7 +54,7 @@
   			{
   				// This security exception will occur if the caller does not have 
   				// some undefined set of SecurityPermission flags.
  -				LogLog.Debug("LoggingEvent: Security exception while trying to get current windows
identity. Error Ignored.");
  +				LogLog.Debug("UserNamePatternConverter: Security exception while trying to get current
windows identity. Error Ignored.");
   
   				writer.Write( "NOT AVAILABLE" );
   			}
  
  
  

Mime
View raw message