summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMinijackson <minijackson@riseup.net>2018-02-23 10:02:50 +0100
committerMinijackson <minijackson@riseup.net>2018-02-26 14:42:42 +0100
commit80debf90c987746d8a45560c2b9e1f4c61f69fd3 (patch)
tree5fd7cc2cc4f8f7b9b43daa8f642f91aeb3340ed0
parent0337b02036788036a262caf43cf6333c95056cd8 (diff)
downloadkube-80debf90c987746d8a45560c2b9e1f4c61f69fd3.tar.gz
kube-80debf90c987746d8a45560c2b9e1f4c61f69fd3.zip
Switch to QVariantList + add logging everywhere!
-rw-r--r--framework/src/sinkfabric.cpp6
-rw-r--r--views/log/qml/View.qml15
2 files changed, 18 insertions, 3 deletions
diff --git a/framework/src/sinkfabric.cpp b/framework/src/sinkfabric.cpp
index b2281a5d..8492f272 100644
--- a/framework/src/sinkfabric.cpp
+++ b/framework/src/sinkfabric.cpp
@@ -152,11 +152,13 @@ public:
152 QVariantMap message; 152 QVariantMap message;
153 if (notification.type == Sink::Notification::Warning) { 153 if (notification.type == Sink::Notification::Warning) {
154 message["type"] = "warning"; 154 message["type"] = "warning";
155 QStringList entities; 155
156 QVariantList entities;
156 for(const auto &entity : notification.entities) { 157 for(const auto &entity : notification.entities) {
157 entities << QString{entity}; 158 entities << entity;
158 } 159 }
159 message["entities"] = entities; 160 message["entities"] = entities;
161
160 message["resource"] = QString{notification.resource}; 162 message["resource"] = QString{notification.resource};
161 if (notification.code == Sink::ApplicationDomain::TransmissionError) { 163 if (notification.code == Sink::ApplicationDomain::TransmissionError) {
162 message["message"] = QObject::tr("Failed to send message."); 164 message["message"] = QObject::tr("Failed to send message.");
diff --git a/views/log/qml/View.qml b/views/log/qml/View.qml
index df9e882f..0dbf3b5e 100644
--- a/views/log/qml/View.qml
+++ b/views/log/qml/View.qml
@@ -45,7 +45,16 @@ Controls.SplitView {
45 if (message.type == Kube.Notifications.error) { 45 if (message.type == Kube.Notifications.error) {
46 root.pendingError = true 46 root.pendingError = true
47 } 47 }
48
49 console.log("Message: " + message.message)
50 console.log("Type: " + message.type)
51 console.log("SubType: " + message.subtype)
52 console.log("Entities: " + message.entities)
53
48 var error = {timestamp: new Date(), message: message.message, details: message.details, resource: message.resource, entities: message.entities} 54 var error = {timestamp: new Date(), message: message.message, details: message.details, resource: message.resource, entities: message.entities}
55
56 console.log("Error: " + JSON.stringify(error))
57
49 if (logModel.count > 0) { 58 if (logModel.count > 0) {
50 var lastEntry = logModel.get(0) 59 var lastEntry = logModel.get(0)
51 //Merge if we get an entry of the same subtype 60 //Merge if we get an entry of the same subtype
@@ -79,6 +88,7 @@ Controls.SplitView {
79 88
80 onCurrentItemChanged: { 89 onCurrentItemChanged: {
81 var error = currentItem.currentData.errors.get(0) 90 var error = currentItem.currentData.errors.get(0)
91 console.log("Current error: " + JSON.stringify(error));
82 if (!!error.resource) { 92 if (!!error.resource) {
83 details.resourceId = error.resource 93 details.resourceId = error.resource
84 } 94 }
@@ -90,6 +100,9 @@ Controls.SplitView {
90 details.subtype = "" 100 details.subtype = ""
91 } 101 }
92 102
103 console.log("Setting resource to: " + error.resource)
104 console.log("Setting entities to: " + error.entities)
105
93 details.entities = error.entities 106 details.entities = error.entities
94 } 107 }
95 108
@@ -352,7 +365,7 @@ Controls.SplitView {
352 } 365 }
353 Kube.Label { 366 Kube.Label {
354 id: subHeadline 367 id: subHeadline
355 text: "Account: " + accountName + "\nMessage-Id: " + entities[0]; 368 text: "Account: " + accountName + "\nMessage-Id: " + entities;
356 color: Kube.Colors.disabledTextColor 369 color: Kube.Colors.disabledTextColor
357 wrapMode: Text.Wrap 370 wrapMode: Text.Wrap
358 } 371 }