Skip to content

Commit 005ab87

Browse files
author
Elad Zelingher
committed
Caching ResolveLogProvider's result
1 parent 5b6eefd commit 005ab87

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/net45/WampSharp/App_Packages/LibLog.4.2/LibLog.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,9 +624,16 @@ private static void RaiseOnCurrentLogProviderSet()
624624
}
625625
#endif
626626

627+
internal static ILogProvider ResolveLogProvider()
628+
{
629+
return mResolvedLogProvider.Value;
630+
}
631+
632+
private static Lazy<ILogProvider> mResolvedLogProvider = new Lazy<ILogProvider>(() => InnerResolveLogProvider());
633+
627634
[SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "System.Console.WriteLine(System.String,System.Object,System.Object)")]
628635
[SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
629-
internal static ILogProvider ResolveLogProvider()
636+
private static ILogProvider InnerResolveLogProvider()
630637
{
631638
try
632639
{

src/net45/WampSharp/Core/Listener/Connections/AsyncConnection/AsyncWampConnection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public LoggerWithConnectionId(ILog logger)
174174

175175
public bool Log(LogLevel logLevel, Func<string> messageFunc, Exception exception = null, params object[] formatParameters)
176176
{
177-
using (LogProvider.OpenMappedContext("ConncetionId", mConnectionId))
177+
using (LogProvider.OpenMappedContext("ConnectionId", mConnectionId))
178178
{
179179
return mLogger.Log(logLevel, messageFunc, exception, formatParameters);
180180
}

src/net45/WampSharp/Core/Listener/WampListener.cs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,10 @@ private IDisposable SessionIdMappedContext(TClient client)
116116
sessionIdString = sessionIdValue.ToString();
117117
}
118118

119-
if (LogProvider.CurrentLogProvider == null)
120-
{
121-
return Disposable.Empty;
122-
}
123-
else
124-
{
125-
IDisposable disposable =
126-
LogProvider.OpenMappedContext("WampSessionId", sessionIdString);
119+
IDisposable disposable =
120+
LogProvider.OpenMappedContext("WampSessionId", sessionIdString);
127121

128-
return disposable;
129-
}
122+
return disposable;
130123
}
131124

132125
protected virtual object GetSessionId(TClient client)

0 commit comments

Comments
 (0)