Propagator: Reset upload blacklist if a chunk suceeds

For #3934

diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index e90fee64dca6c41213ad9f122ec5aff1e4f8d33c..6d3d29965dcda756d93d4ab1d41b8f05e65412b3 100644 (file)
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -657,6 +657,7 @@ void PropagateUploadFileQNAM::slotPutFinished()
         pi._chunk = (currentChunk + _startChunk + 1) % _chunkCount ; // next chunk to start with
         pi._transferid = _transferId;
         pi._modtime =  Utility::qDateTimeFromTime_t(_item->_modtime);
+        _propagator->_journal->wipeErrorBlacklistEntry(_item->_file);
         _propagator->_journal->setUploadInfo(_item->_file, pi);
         _propagator->_journal->commit("Upload info");
         startNextChunk();

diff --git a/src/libsync/syncjournaldb.cpp b/src/libsync/syncjournaldb.cpp
index 35fa4d6493d90b44dc26461b4a23f060c6afc183..066598fa9d2ba7208555fdc52bf3b0f23e145c23 100644 (file)
--- a/src/libsync/syncjournaldb.cpp
+++ b/src/libsync/syncjournaldb.cpp
@@ -1179,6 +1179,7 @@ void SyncJournalDb::wipeErrorBlacklistEntry( const QString& file )
         if( ! query.exec() ) {
             sqlFail("Deletion of blacklist item failed.", query);
         }
+        qDebug() <<  query.lastQuery() << file;
     }
 }