diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-10-26 20:18:24 +0200 |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-10-26 20:18:24 +0200 |
| commit | e666c8a42b931f547cdb2176475b2124203fe64b (patch) | |
| tree | a918b9dd9c246834ad1225b465c9aed3170112b2 /components | |
| parent | c8df955b2866e8aa6279486b8395a3bd2e79f9d5 (diff) | |
| download | kube-e666c8a42b931f547cdb2176475b2124203fe64b.tar.gz kube-e666c8a42b931f547cdb2176475b2124203fe64b.zip | |
Merge logentries by subtype if available
Diffstat (limited to 'components')
| -rw-r--r-- | components/kube/contents/ui/LogView.qml | 8 |
1 files changed, 8 insertions, 0 deletions
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 { | |||
| 46 | root.pendingError = true | 46 | root.pendingError = true |
| 47 | } | 47 | } |
| 48 | var error = {timestamp: new Date(), message: message.message, details: message.details, resource: message.resource} | 48 | var error = {timestamp: new Date(), message: message.message, details: message.details, resource: message.resource} |
| 49 | if (logModel.count > 0) { | ||
| 50 | var lastEntry = logModel.get(0) | ||
| 51 | //Merge if we get an entry of the same subtype | ||
| 52 | if (lastEntry.subtype && lastEntry.subtype == message.subtype) { | ||
| 53 | logModel.set(0, {type: message.type, subtype: message.subtype, errors: [error].concat(lastEntry.errors)}) | ||
| 54 | return | ||
| 55 | } | ||
| 56 | } | ||
| 49 | logModel.insert(0, {type: message.type, subtype: message.subtype, errors: [error]}) | 57 | logModel.insert(0, {type: message.type, subtype: message.subtype, errors: [error]}) |
| 50 | } | 58 | } |
| 51 | } | 59 | } |