michalks/colnod-connector
1
0
Fork 0
forked from ondra/colnod-connector
Code Issues Pull Requests Projects Releases Wiki Activity

edit error handling

Browse Source
This commit is contained in:
Ondřej Fischer 2019-12-04 18:19:28 +01:00
parent fe0954edf1
commit b405d95320
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/colnod/syncmanager.cpp
View File

@ -45,7 +45,6 @@ bool SyncManager::startSynchronization()
qInfo(syncmanager) << equals; qInfo(syncmanager) << equals;
qInfo(syncmanager) << "SYNCHRONIZATION BEGIN"; qInfo(syncmanager) << "SYNCHRONIZATION BEGIN";
qInfo(syncmanager) << equals; qInfo(syncmanager) << equals;
qInfo(syncmanager) << "DOWNLOADING DATA -> BEGIN"; qInfo(syncmanager) << "DOWNLOADING DATA -> BEGIN";
qInfo(syncmanager) << dash; qInfo(syncmanager) << dash;
@ -62,15 +61,14 @@ bool SyncManager::startSynchronization()
colnod->downloadData(mlastSync.timestamp()); colnod->downloadData(mlastSync.timestamp());
connect(colnod.get(), &ColnodAPI::downloadDataFinished, [=](std::shared_ptr<Data> colnodData) { connect(colnod.get(), &ColnodAPI::downloadDataFinished, [=](std::shared_ptr<Data> colnodData) {
qInfo(syncmanager) << "DOWNLOADING DATA -> FINISHED";
qInfo(syncmanager) << equals;
if (!colnodData) { if (!colnodData) {
qCritical(syncmanager) << "Not possible to get correct data from colnod"; qCritical(syncmanager) << "Not possible to get correct data from colnod";
QCoreApplication::exit(-1); QCoreApplication::exit(-1);
return; return;
} }
qInfo(syncmanager) << "DOWNLOADING DATA -> FINISHED";
qInfo(syncmanager) << equals;
// NOW I SHOULD HAVE VALID DATA FROM COLNOD // NOW I SHOULD HAVE VALID DATA FROM COLNOD
@ -92,7 +90,11 @@ bool SyncManager::startSynchronization()
} }
// data is processed to other sides // data is processed to other sides
connect(colnod.get(), &ColnodAPI::dataProcessFinished, [&](){ connect(colnod.get(), &ColnodAPI::dataProcessFinished, [&](bool success){
if (!success) {
qCritical(syncmanager) << "Not possible to upload data to colnod";
}
qInfo(syncmanager) << "PROCESSING DATA -> FINISHED"; qInfo(syncmanager) << "PROCESSING DATA -> FINISHED";
qInfo(syncmanager) << equals; qInfo(syncmanager) << equals;
@ -105,6 +107,7 @@ bool SyncManager::startSynchronization()
// updated data are ready // updated data are ready
connect(tokensRequest.get(), &serversdk::Request::finished, [=](){ connect(tokensRequest.get(), &serversdk::Request::finished, [=](){
auto uploadedData = std::make_shared<Data>(); auto uploadedData = std::make_shared<Data>();
uploadedData->loadTokensFromJson(tokensRequest->responseData()); uploadedData->loadTokensFromJson(tokensRequest->responseData());
@ -139,9 +142,7 @@ bool SyncManager::startSynchronization()
}); });
colnod->processData(preparedData->databaseData); // TODO: errors??? colnod->processData(preparedData->databaseData);
//qCritical(syncmanager) << "Not possible to upload data to colnod";
}); });
return true; return true;
@ -162,7 +163,7 @@ std::unique_ptr<PreparedData> SyncManager::prepareDataNew(const std::shared_ptr<
qInfo(syncmanager) << "Resolve conflicts ( changes on same item on both Colnod and DB ):"; qInfo(syncmanager) << "Resolve conflicts ( changes on same item on both Colnod and DB ):";
qInfo(syncmanager) << dash; qInfo(syncmanager) << dash;
// add all data which should be pushed to database
for (const auto &colnodToken : colnodData->updatedTokens) { for (const auto &colnodToken : colnodData->updatedTokens) {
// not conflict so add to prepered tokens // not conflict so add to prepered tokens