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

disable the auto reconnect from AWS, use our own logic instead

Browse Source 
hopefully this bypasses the SIGSEGV in the libaws when this happens
This commit is contained in:
Michael Zanetti 2017-12-13 19:05:39 +01:00
parent 520a39a1a7
commit 3d93407307
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libguh-core/awsconnector.cpp
View File

@ -41,9 +41,9 @@ DisconnectCallbackContextData::~DisconnectCallbackContextData() {}
AWSConnector::AWSConnector(QObject *parent) : QObject(parent) AWSConnector::AWSConnector(QObject *parent) : QObject(parent)
{ {
// Enable some AWS logging (does not regard our logging categories) // Enable some AWS logging (does not regard our logging categories)
// std::shared_ptr<awsiotsdk::util::Logging::ConsoleLogSystem> p_log_system = std::shared_ptr<awsiotsdk::util::Logging::ConsoleLogSystem> p_log_system =
// std::make_shared<awsiotsdk::util::Logging::ConsoleLogSystem>(awsiotsdk::util::Logging::LogLevel::Info); std::make_shared<awsiotsdk::util::Logging::ConsoleLogSystem>(awsiotsdk::util::Logging::LogLevel::Info);
// awsiotsdk::util::Logging::InitializeAWSLogging(p_log_system); awsiotsdk::util::Logging::InitializeAWSLogging(p_log_system);
m_disconnectContextData = std::shared_ptr<awsiotsdk::DisconnectCallbackContextData>(new DisconnectContext(this)); m_disconnectContextData = std::shared_ptr<awsiotsdk::DisconnectCallbackContextData>(new DisconnectContext(this));
m_subscriptionContextData = std::shared_ptr<awsiotsdk::mqtt::SubscriptionHandlerContextData>(new SubscriptionContext(this)); m_subscriptionContextData = std::shared_ptr<awsiotsdk::mqtt::SubscriptionHandlerContextData>(new SubscriptionContext(this));
@ -91,7 +91,7 @@ void AWSConnector::doConnect()
)); ));
m_client = MqttClient::Create(m_networkConnection, std::chrono::milliseconds(2800), &onDisconnectedCallback, m_disconnectContextData); m_client = MqttClient::Create(m_networkConnection, std::chrono::milliseconds(2800), &onDisconnectedCallback, m_disconnectContextData);
m_client->SetAutoReconnectEnabled(true); m_client->SetAutoReconnectEnabled(false);
m_client->SetMaxReconnectBackoffTimeout(std::chrono::seconds(10)); m_client->SetMaxReconnectBackoffTimeout(std::chrono::seconds(10));
qCDebug(dcAWS()) << "Connecting to AWS with ID:" << m_clientId << "endpoint:" << m_currentEndpoint << "Min reconnect timeout:" << m_client->GetMinReconnectBackoffTimeout().count() << "Max reconnect timeout:" << (quint32)m_client->GetMaxReconnectBackoffTimeout().count(); qCDebug(dcAWS()) << "Connecting to AWS with ID:" << m_clientId << "endpoint:" << m_currentEndpoint << "Min reconnect timeout:" << m_client->GetMinReconnectBackoffTimeout().count() << "Max reconnect timeout:" << (quint32)m_client->GetMaxReconnectBackoffTimeout().count();
@ -256,6 +256,8 @@ quint16 AWSConnector::publish(const QString &topic, const QVariantMap &message)
void AWSConnector::onDisconnected() void AWSConnector::onDisconnected()
{ {
qCDebug(dcAWS) << "AWS disconnected."; qCDebug(dcAWS) << "AWS disconnected.";
m_client.reset();
m_networkConnection.reset();
emit disconnected(); emit disconnected();
bool needReRegistering = false; bool needReRegistering = false;