summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-09-07 16:38:38 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-09-07 16:38:38 +0200
commitb7b5ec6b6b6dc269500574ea6d8c34852179edc7 (patch)
treeb0f8be93d5229d12e518889d4b00370059235166
parenta8d8a9360f3717c420e69cb42a3cbefcacd0ed88 (diff)
downloadkube-b7b5ec6b6b6dc269500574ea6d8c34852179edc7.tar.gz
kube-b7b5ec6b6b6dc269500574ea6d8c34852179edc7.zip
Add some more info about errors to the logview.
-rw-r--r--components/kube/contents/ui/LogView.qml4
-rw-r--r--framework/src/sinkfabric.cpp3
2 files changed, 4 insertions, 3 deletions
diff --git a/components/kube/contents/ui/LogView.qml b/components/kube/contents/ui/LogView.qml
index 5ed7f784..06cd0b66 100644
--- a/components/kube/contents/ui/LogView.qml
+++ b/components/kube/contents/ui/LogView.qml
@@ -32,7 +32,7 @@ Controls.SplitView {
32 Kube.Listener { 32 Kube.Listener {
33 filter: Kube.Messages.notification 33 filter: Kube.Messages.notification
34 onMessageReceived: { 34 onMessageReceived: {
35 logModel.insert(0, {message: message.message, timestamp: new Date(), resource: message.resource}); 35 logModel.insert(0, {message: message.message, details: message.details, timestamp: new Date(), resource: message.resource});
36 } 36 }
37 } 37 }
38 38
@@ -57,7 +57,7 @@ Controls.SplitView {
57 57
58 onCurrentItemChanged: { 58 onCurrentItemChanged: {
59 details.resourceId = currentItem.currentData.resource 59 details.resourceId = currentItem.currentData.resource
60 details.message = currentItem.currentData.message 60 details.message = currentItem.currentData.message + "\n" + currentItem.currentData.details
61 details.timestamp = currentItem.currentData.timestamp 61 details.timestamp = currentItem.currentData.timestamp
62 } 62 }
63 delegate: Kube.ListDelegate { 63 delegate: Kube.ListDelegate {
diff --git a/framework/src/sinkfabric.cpp b/framework/src/sinkfabric.cpp
index 6d8369d7..766380af 100644
--- a/framework/src/sinkfabric.cpp
+++ b/framework/src/sinkfabric.cpp
@@ -145,6 +145,7 @@ public:
145 } else if (notification.type == Sink::Notification::Error) { 145 } else if (notification.type == Sink::Notification::Error) {
146 message["type"] = Notification::Warning; 146 message["type"] = Notification::Warning;
147 message["resource"] = QString{notification.resource}; 147 message["resource"] = QString{notification.resource};
148 message["details"] = notification.message;
148 switch(notification.code) { 149 switch(notification.code) {
149 case Sink::ApplicationDomain::ConnectionError: 150 case Sink::ApplicationDomain::ConnectionError:
150 message["message"] = QObject::tr("Failed to connect to server."); 151 message["message"] = QObject::tr("Failed to connect to server.");
@@ -162,7 +163,7 @@ public:
162 message["message"] = QObject::tr("Connection lost."); 163 message["message"] = QObject::tr("Connection lost.");
163 break; 164 break;
164 default: 165 default:
165 message["message"] = "An unknown error occurred: " + notification.message; 166 message["message"] = QObject::tr("An unknown error occurred.");
166 } 167 }
167 Fabric::Fabric{}.postMessage("errorNotification", message); 168 Fabric::Fabric{}.postMessage("errorNotification", message);
168 } else if (notification.type == Sink::Notification::Info) { 169 } else if (notification.type == Sink::Notification::Info) {