ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add some more logging, also hack-subscribe for the current tests

Browse Source
This commit is contained in:
Michael Zanetti 2017-10-05 12:08:12 +02:00
parent 94c2b90e4a
commit 8990697c4e
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libguh-core/awsconnector.cpp
View File

@ -37,6 +37,11 @@ AWSConnector::AWSConnector(QObject *parent) : QObject(parent)
{ {
connect(this, &AWSConnector::connected, this, &AWSConnector::onConnected, Qt::QueuedConnection); connect(this, &AWSConnector::connected, this, &AWSConnector::onConnected, Qt::QueuedConnection);
connect(this, &AWSConnector::disconnected, this, &AWSConnector::onDisconnected, Qt::QueuedConnection); connect(this, &AWSConnector::disconnected, this, &AWSConnector::onDisconnected, Qt::QueuedConnection);
// Enable some AWS logging (does not regard our logging categories)
std::shared_ptr<awsiotsdk::util::Logging::ConsoleLogSystem> p_log_system =
std::make_shared<awsiotsdk::util::Logging::ConsoleLogSystem>(awsiotsdk::util::Logging::LogLevel::Info);
awsiotsdk::util::Logging::InitializeAWSLogging(p_log_system);
} }
AWSConnector::~AWSConnector() AWSConnector::~AWSConnector()
@ -137,16 +142,16 @@ void AWSConnector::onConnected()
registerDevice(); registerDevice();
// TODO: remove this again. just using this for testing now to skip the registerDevice step // TODO: remove this again. just using this for testing now to skip the registerDevice step
QStringList subscriptions;
subscriptions.append(QString("%1/pair/response").arg(m_clientId));
subscriptions.append(QString("%1/device/users/response").arg(m_clientId));
subscribe(subscriptions);
retrievePairedDeviceInfo(); retrievePairedDeviceInfo();
} }
void AWSConnector::onDisconnected() void AWSConnector::onDisconnected()
{ {
if (m_reconnect) { qCDebug(dcAWS) << "AWS disconnected. (should reconnect on it's own)";
m_client->Disconnect(std::chrono::milliseconds(1000));
// m_networkConnection->Connect();
connect2AWS(m_currentEndpoint, m_clientId, m_clientName, m_caFile, m_clientCertFile, m_clientPrivKeyFile);
}
} }
void AWSConnector::retrievePairedDeviceInfo() void AWSConnector::retrievePairedDeviceInfo()
@ -280,6 +285,10 @@ ResponseCode AWSConnector::onSubscriptionReceivedCallback(util::String topic_nam
} }
} else if (topic == QString("%1/device/users/response").arg(connector->m_clientId)) { } else if (topic == QString("%1/device/users/response").arg(connector->m_clientId)) {
qCDebug(dcAWS) << "have device pairings:" << jsonDoc.toVariant().toMap().value("pairings").toList(); qCDebug(dcAWS) << "have device pairings:" << jsonDoc.toVariant().toMap().value("pairings").toList();
if (jsonDoc.toVariant().toMap().value("pairings").toList().isEmpty()) {
qCDebug(dcAWS()) << "No devices paired yet...";
return ResponseCode::SUCCESS;
}
QStringList topics; QStringList topics;
foreach (const QVariant &pairing, jsonDoc.toVariant().toMap().value("pairings").toList()) { foreach (const QVariant &pairing, jsonDoc.toVariant().toMap().value("pairings").toList()) {
topics << QString("eu-west-1:%1/listeningPeer/#").arg(pairing.toMap().value("cognitoIdIdentityId").toString()); topics << QString("eu-west-1:%1/listeningPeer/#").arg(pairing.toMap().value("cognitoIdIdentityId").toString());
@ -309,11 +318,8 @@ ResponseCode AWSConnector::onSubscriptionReceivedCallback(util::String topic_nam
ResponseCode AWSConnector::onDisconnectedCallback(util::String mqtt_client_id, std::shared_ptr<DisconnectCallbackContextData> p_app_handler_data) ResponseCode AWSConnector::onDisconnectedCallback(util::String mqtt_client_id, std::shared_ptr<DisconnectCallbackContextData> p_app_handler_data)
{ {
Q_UNUSED(p_app_handler_data) Q_UNUSED(mqtt_client_id)
AWSConnector* connector = dynamic_cast<AWSConnector*>(p_app_handler_data.get()); AWSConnector* connector = dynamic_cast<AWSConnector*>(p_app_handler_data.get());
qWarning() << connector->m_client->IsAutoReconnectEnabled();
qCDebug(dcAWS()) << "disconnected" << QString::fromStdString(mqtt_client_id) << connector << p_app_handler_data.get();
emit connector->disconnected(); emit connector->disconnected();
return ResponseCode::SUCCESS; return ResponseCode::SUCCESS;
} }

3
libguh-core/awsconnector.h
View File

@ -27,6 +27,9 @@
#include "MbedTLS/MbedTLSConnection.hpp" #include "MbedTLS/MbedTLSConnection.hpp"
#include <mqtt/Client.hpp> #include <mqtt/Client.hpp>
#include <mqtt/Common.hpp> #include <mqtt/Common.hpp>
#include "util/logging/Logging.hpp"
#include "util/logging/LogMacros.hpp"
#include "util/logging/ConsoleLogSystem.hpp"
class AWSConnector : public QObject, public awsiotsdk::mqtt::SubscriptionHandlerContextData, public awsiotsdk::DisconnectCallbackContextData class AWSConnector : public QObject, public awsiotsdk::mqtt::SubscriptionHandlerContextData, public awsiotsdk::DisconnectCallbackContextData
{ {