Merge branch 'starterkit'

Conflicts:

	src/DotNetOAuth/Loggers/Log4NetLogger.cs

1 files changed, 7 insertions, 3 deletions

diff --git a/src/DotNetOAuth/Loggers/TraceLogger.cs b/src/DotNetOAuth/Loggers/TraceLogger.cs
index 04b0a3c..c55d6df 100644
--- a/src/DotNetOAuth/Loggers/TraceLogger.cs
+++ b/src/DotNetOAuth/Loggers/TraceLogger.cs
@@ -7,7 +7,11 @@ namespace DotNetOAuth.Loggers {
 	using System.Security.Permissions;

 

 	internal class TraceLogger : ILog {

-		private TraceSwitch traceSwitch = new TraceSwitch("OpenID", "OpenID Trace Switch");

+		private TraceSwitch traceSwitch;

+

+		internal TraceLogger(string name) {

+			traceSwitch = new TraceSwitch(name, name + " Trace Switch");

+		}

 

 		#region ILog Properties

 

@@ -321,8 +325,8 @@ namespace DotNetOAuth.Loggers {
 		/// if sufficient CAS permissions are granted to use it, otherwise returns false.

 		/// </summary>

 		/// <returns>The created <see cref="ILog"/> instance.</returns>

-		internal static ILog Initialize() {

-			return IsSufficientPermissionGranted ? new TraceLogger() : null;

+		internal static ILog Initialize(string name) {

+			return IsSufficientPermissionGranted ? new TraceLogger(name) : null;

 		}

 	}

 }