From 0769b8144746a8cd778b00e8038b80be27a8b09e Mon Sep 17 00:00:00 2001
From: serdar-eric <serdareric@gmail.com>
Date: Tue, 28 Jun 2016 23:40:58 +0300
Subject: [PATCH] Fixed: FallbackGroup and json serialization bug(temporary)
 (#22)

---
 src/NLog.Targets.ElasticSearch/ElasticSearchTarget.cs | 11 ++++++++++-
 .../NLog.Targets.ElasticSearch.csproj                 |  4 ++++
 src/NLog.Targets.ElasticSearch/packages.config        |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/NLog.Targets.ElasticSearch/ElasticSearchTarget.cs b/src/NLog.Targets.ElasticSearch/ElasticSearchTarget.cs
index 97408ac..1d24d5b 100644
--- a/src/NLog.Targets.ElasticSearch/ElasticSearchTarget.cs
+++ b/src/NLog.Targets.ElasticSearch/ElasticSearchTarget.cs
@@ -5,6 +5,8 @@
 using NLog.Common;
 using NLog.Config;
 using NLog.Layouts;
+using Newtonsoft.Json;
+using System.Dynamic;
 
 namespace NLog.Targets.ElasticSearch
 {
@@ -115,6 +117,10 @@ private void SendBatch(IEnumerable<AsyncLogEventInfo> events)
                 InternalLogger.Error("Failed to send log messages to elasticsearch: status={0}, message=\"{1}\"",
                     result.HttpStatusCode, result.OriginalException?.Message ?? "No error message. Enable Trace logging for more information.");
                 InternalLogger.Trace("Failed to send log messages to elasticsearch: result={0}", result);
+
+                //rethow exception for fallbackgroup setup.
+                if (result.OriginalException != null)
+                    throw result.OriginalException;
             }
             catch (Exception ex)
             {
@@ -138,8 +144,11 @@ private object FormPayload(IEnumerable<LogEventInfo> logEvents)
                     {"message", Layout.Render(logEvent)}
                 };
 
+                //see : https://github.com/elastic/elasticsearch-net/issues/2052
+                var ex = JsonConvert.DeserializeObject<ExpandoObject>(JsonConvert.SerializeObject(logEvent.Exception));
+
                 if (logEvent.Exception != null)
-                    document.Add("exception", logEvent.Exception);
+                    document.Add("exception", ex);
 
                 foreach (var field in Fields)
                 {
diff --git a/src/NLog.Targets.ElasticSearch/NLog.Targets.ElasticSearch.csproj b/src/NLog.Targets.ElasticSearch/NLog.Targets.ElasticSearch.csproj
index 7a4466e..6d44ec1 100644
--- a/src/NLog.Targets.ElasticSearch/NLog.Targets.ElasticSearch.csproj
+++ b/src/NLog.Targets.ElasticSearch/NLog.Targets.ElasticSearch.csproj
@@ -38,6 +38,10 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
diff --git a/src/NLog.Targets.ElasticSearch/packages.config b/src/NLog.Targets.ElasticSearch/packages.config
index d706439..6a42cb7 100644
--- a/src/NLog.Targets.ElasticSearch/packages.config
+++ b/src/NLog.Targets.ElasticSearch/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Elasticsearch.Net" version="2.1.0" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="NLog" version="4.2.3" targetFramework="net45" />
 </packages>
\ No newline at end of file