Fixes two problems, needing to use indexers on a dynamic, and a logic…

… error that prevented the durable log files from being processed. (#266)
serilog-contrib · Aug 20, 2019 · 9d9930e · 9d9930e
1 parent 6b63825
commit 9d9930e
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/...g.Sinks.Elasticsearch/Sinks/ElasticSearch/Durable/Elasticsearch/ElasticsearchLogClient.cs b/...g.Sinks.Elasticsearch/Sinks/ElasticSearch/Durable/Elasticsearch/ElasticsearchLogClient.cs
@@ -35,7 +35,7 @@ public async Task<SentPayloadResult> SendPayloadAsync(List<string> payload)
             return await SendPayloadAsync(payload, true);
         }
 
-        public async Task<SentPayloadResult> SendPayloadAsync(List<string> payload,bool first)
+        public async Task<SentPayloadResult> SendPayloadAsync(List<string> payload, bool first)
         {
             try
             {
@@ -45,10 +45,10 @@ public async Task<SentPayloadResult> SendPayloadAsync(List<string> payload,bool
                 if (response.Success)
                 {
                     var cleanPayload = new List<string>();
-                    var invalidPayload = GetInvalidPayloadAsync(response, payload,out cleanPayload);
-                    if ((cleanPayload?.Any() ?? false) && first)
+                    var invalidPayload = GetInvalidPayloadAsync(response, payload, out cleanPayload);
+                    if ((cleanPayload?.Any() == false) && first)
                     {
-                        await SendPayloadAsync(cleanPayload,false);
+                        await SendPayloadAsync(cleanPayload, false);
                     }
 
                     return new SentPayloadResult(response, true, invalidPayload);
@@ -85,16 +85,17 @@ private InvalidResult GetInvalidPayloadAsync(DynamicResponse baseResult, List<st
             bool hasErrors = false;
             foreach (dynamic item in items)
             {
-                long? status = item.index?.status;
+                var itemIndex = item?["index"];
+                long? status = itemIndex?["status"];
                 i++;
                 if (!status.HasValue || status < 300)
                 {
                     continue;
                 }
 
                 hasErrors = true;
-                var id = item.index?._id;
-                var error = item.index?.error;
+                var id = itemIndex?["_id"];
+                var error = itemIndex?["error"];
                 if (int.TryParse(id.Split('_')[0], out int index))
                 {
                     SelfLog.WriteLine("Received failed ElasticSearch shipping result {0}: {1}. Failed payload : {2}.", status, error?.ToString(), payload.ElementAt(index * 2 + 1));