Skip to content
This repository has been archived by the owner on Dec 5, 2019. It is now read-only.

Pass objects without toString conversion to Nlog MDC #179

Closed
wants to merge 3 commits into from
Closed

Pass objects without toString conversion to Nlog MDC #179

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3cbfe7
Pass objects without toString conversion to Nlog and Log4Net MDC
Sep 5, 2018
36c2476
revert the Log4Net change. add a fallback MDC SetMethod for NLog
Sep 7, 2018
cd6ab76
revert file mode changes
Sep 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 30 additions & 13 deletions src/LibLog/LogProviders/NLogLogProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,43 @@ protected override OpenMdc GetOpenMdcMethod()
{
var mdcContextType = Type.GetType("NLog.MappedDiagnosticsContext, NLog");

var setMethod = mdcContextType.GetMethod("Set", typeof(string), typeof(string));
var removeMethod = mdcContextType.GetMethod("Remove", typeof(string));
var keyParam = Expression.Parameter(typeof(string), "key");
var valueParam = Expression.Parameter(typeof(string), "value");

var setMethodCall = Expression.Call(null, setMethod, keyParam, valueParam);
var removeMethod = mdcContextType.GetMethod("Remove", typeof(string));
var removeMethodCall = Expression.Call(null, removeMethod, keyParam);

var set = Expression
.Lambda<Action<string, string>>(setMethodCall, keyParam, valueParam)
.Compile();
var remove = Expression
.Lambda<Action<string>>(removeMethodCall, keyParam)
.Compile();

return (key, value, _) =>
var setMethod = mdcContextType.GetMethod("Set", typeof(string), typeof(object));
if (setMethod != null)
{
set(key, value.ToString());
return new DisposableAction(() => remove(key));
};
var valueParam = Expression.Parameter(typeof(object), "value");
var setMethodCall = Expression.Call(null, setMethod, keyParam, valueParam);
var set = Expression
.Lambda<Action<string, object>>(setMethodCall, keyParam, valueParam)
.Compile();

return (key, value, _) =>
{
set(key, value);
return new DisposableAction(() => remove(key));
};
}
else
{
setMethod = mdcContextType.GetMethod("Set", typeof(string), typeof(string));
var valueParam = Expression.Parameter(typeof(string), "value");
var setMethodCall = Expression.Call(null, setMethod, keyParam, valueParam);
var set = Expression
.Lambda<Action<string, string>>(setMethodCall, keyParam, valueParam)
.Compile();

return (key, value, _) =>
{
set(key, value.ToString());
return new DisposableAction(() => remove(key));
};
}
}

private static Type GetLogManagerType()
Expand Down