From ceac3a797d161c985365b304ae7a15268b90ba09 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Sun, 18 Mar 2018 14:32:07 +0100
Subject: Improved debug output

---
 common/resourceaccess.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'common')

diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index 66684c3..817b7eb 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -158,9 +158,10 @@ KAsync::Job<QSharedPointer<QLocalSocket>> ResourceAccess::connectToServer(const
             future.setValue(s);
             future.setFinished();
         });
-        QObject::connect(s.data(), static_cast<void (QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error), context, [&future, context](QLocalSocket::LocalSocketError) {
+        QObject::connect(s.data(), static_cast<void (QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error), context, [&future, &s, context](QLocalSocket::LocalSocketError localSocketError) {
+            const auto errorString = s->errorString();
             delete context;
-            future.setError(-1, "Failed to connect to server.");
+            future.setError(localSocketError, "Failed to connect to socket: " + errorString);
         });
         s->connectToServer(identifier);
     });
@@ -182,7 +183,7 @@ KAsync::Job<void> ResourceAccess::Private::tryToConnect()
                             static int maxRetries = timeout / waitTime;
                             if (*counter > maxRetries) {
                                 SinkTrace() << "Giving up after " << *counter << "tries";
-                                return KAsync::error<KAsync::ControlFlowFlag>("Failed to connect to socket");
+                                return KAsync::error<KAsync::ControlFlowFlag>(error);
                             } else {
                                 *counter = *counter + 1;
                                 return KAsync::wait(waitTime).then(KAsync::value(KAsync::Continue));
@@ -226,7 +227,7 @@ KAsync::Job<void> ResourceAccess::Private::initializeSocket()
                                 });
                         } else {
                             SinkError() << "Failed to start resource";
-                            return KAsync::error(-1, "Failed to start resource.");
+                            return KAsync::error("Failed to start resource.");
                         }
                     } else {
                         SinkTrace() << "Connected to resource, without having to start it.";
@@ -429,7 +430,7 @@ void ResourceAccess::open()
             [this, time](const KAsync::Error &error) {
                 d->openingSocket = false;
                 if (error) {
-                    SinkError() << "Failed to initialize socket " << error.errorMessage;
+                    SinkError() << "Failed to initialize socket " << error;
                     d->abortPendingOperations();
                 } else {
                     SinkTrace() << "Socket is initialized." << Log::TraceTime(time->elapsed());
-- 
cgit v1.2.3