From e666c8a42b931f547cdb2176475b2124203fe64b Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 26 Oct 2017 20:18:24 +0200
Subject: Merge logentries by subtype if available

---
 components/kube/contents/ui/LogView.qml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'components')

diff --git a/components/kube/contents/ui/LogView.qml b/components/kube/contents/ui/LogView.qml
index e92db8a2..24d42373 100644
--- a/components/kube/contents/ui/LogView.qml
+++ b/components/kube/contents/ui/LogView.qml
@@ -46,6 +46,14 @@ Controls.SplitView {
                     root.pendingError = true
                 }
                 var error = {timestamp: new Date(), message: message.message, details: message.details, resource: message.resource}
+                if (logModel.count > 0) {
+                    var lastEntry = logModel.get(0)
+                    //Merge if we get an entry of the same subtype
+                    if (lastEntry.subtype && lastEntry.subtype == message.subtype) {
+                        logModel.set(0, {type: message.type, subtype: message.subtype, errors: [error].concat(lastEntry.errors)})
+                        return
+                    }
+                }
                 logModel.insert(0, {type: message.type, subtype: message.subtype, errors: [error]})
             }
         }
-- 
cgit v1.2.3