summaryrefslogtreecommitdiffstats
path: root/common/resourcecontrol.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'common/resourcecontrol.cpp')
-rw-r--r--common/resourcecontrol.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/common/resourcecontrol.cpp b/common/resourcecontrol.cpp
index d8b0972..ac6ddba 100644
--- a/common/resourcecontrol.cpp
+++ b/common/resourcecontrol.cpp
@@ -25,6 +25,7 @@
25#include <functional> 25#include <functional>
26 26
27#include "resourceaccess.h" 27#include "resourceaccess.h"
28#include "resourceconfig.h"
28#include "commands.h" 29#include "commands.h"
29#include "log.h" 30#include "log.h"
30#include "notifier.h" 31#include "notifier.h"
@@ -44,7 +45,7 @@ KAsync::Job<void> ResourceControl::shutdown(const QByteArray &identifier)
44 [identifier, time](QSharedPointer<QLocalSocket> socket, KAsync::Future<void> &future) { 45 [identifier, time](QSharedPointer<QLocalSocket> socket, KAsync::Future<void> &future) {
45 // We can't currently reuse the socket 46 // We can't currently reuse the socket
46 socket->close(); 47 socket->close();
47 auto resourceAccess = ResourceAccessFactory::instance().getAccess(identifier); 48 auto resourceAccess = ResourceAccessFactory::instance().getAccess(identifier, ResourceConfig::getResourceType(identifier));
48 resourceAccess->open(); 49 resourceAccess->open();
49 resourceAccess->sendCommand(Sink::Commands::ShutdownCommand) 50 resourceAccess->sendCommand(Sink::Commands::ShutdownCommand)
50 .then<void>([&future, resourceAccess, time]() { 51 .then<void>([&future, resourceAccess, time]() {
@@ -64,7 +65,7 @@ KAsync::Job<void> ResourceControl::start(const QByteArray &identifier)
64 Trace() << "start " << identifier; 65 Trace() << "start " << identifier;
65 auto time = QSharedPointer<QTime>::create(); 66 auto time = QSharedPointer<QTime>::create();
66 time->start(); 67 time->start();
67 auto resourceAccess = ResourceAccessFactory::instance().getAccess(identifier); 68 auto resourceAccess = ResourceAccessFactory::instance().getAccess(identifier, ResourceConfig::getResourceType(identifier));
68 resourceAccess->open(); 69 resourceAccess->open();
69 return resourceAccess->sendCommand(Sink::Commands::PingCommand).then<void>([resourceAccess, time]() { Trace() << "Start complete." << Log::TraceTime(time->elapsed()); }); 70 return resourceAccess->sendCommand(Sink::Commands::PingCommand).then<void>([resourceAccess, time]() { Trace() << "Start complete." << Log::TraceTime(time->elapsed()); });
70} 71}
@@ -75,7 +76,7 @@ KAsync::Job<void> ResourceControl::flushMessageQueue(const QByteArrayList &resou
75 return KAsync::iterate(resourceIdentifier) 76 return KAsync::iterate(resourceIdentifier)
76 .template each<void, QByteArray>([](const QByteArray &resource, KAsync::Future<void> &future) { 77 .template each<void, QByteArray>([](const QByteArray &resource, KAsync::Future<void> &future) {
77 Trace() << "Flushing message queue " << resource; 78 Trace() << "Flushing message queue " << resource;
78 auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource); 79 auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource, ResourceConfig::getResourceType(resource));
79 resourceAccess->open(); 80 resourceAccess->open();
80 resourceAccess->synchronizeResource(false, true).then<void>([&future, resourceAccess]() { future.setFinished(); }).exec(); 81 resourceAccess->synchronizeResource(false, true).then<void>([&future, resourceAccess]() { future.setFinished(); }).exec();
81 }); 82 });
@@ -94,7 +95,7 @@ KAsync::Job<void> ResourceControl::inspect(const Inspection &inspectionCommand)
94 auto time = QSharedPointer<QTime>::create(); 95 auto time = QSharedPointer<QTime>::create();
95 time->start(); 96 time->start();
96 Trace() << "Sending inspection " << resource; 97 Trace() << "Sending inspection " << resource;
97 auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource); 98 auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource, ResourceConfig::getResourceType(resource));
98 resourceAccess->open(); 99 resourceAccess->open();
99 auto notifier = QSharedPointer<Sink::Notifier>::create(resourceAccess); 100 auto notifier = QSharedPointer<Sink::Notifier>::create(resourceAccess);
100 auto id = QUuid::createUuid().toByteArray(); 101 auto id = QUuid::createUuid().toByteArray();