deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-05-22 23:52:13 +02:00
Code Issues Projects Releases Wiki Activity

Reinitialize sync engine after three failed trials (#283)

Browse source 
* After extended suspend, or bad connection, the connection to OD might
go stale - thus no network connection to Microsoft OneDrive Service, skipping sync
and this continues ad infinitum. Change the last action to re-initialize the sync engine.
This commit is contained in:
Norbert Preining 2018-12-13 05:08:18 +09:00 committed by abraunegg
parent 6a62406db7
commit 91aaf91aa6
2 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main.d
View file

@ -398,17 +398,21 @@ int main(string[] args)
onedrive.http.shutdown(); onedrive.http.shutdown();
return EXIT_FAILURE; return EXIT_FAILURE;
} }
performSync(sync, singleDirectory, downloadOnly, localFirst, uploadOnly); try {
if (!downloadOnly) { performSync(sync, singleDirectory, downloadOnly, localFirst, uploadOnly);
// discard all events that may have been generated by the sync if (!downloadOnly) {
m.update(false); // discard all events that may have been generated by the sync
m.update(false);
}
} catch (CurlException e) {
// we already tried three times in the performSync routine
// if we still have problems, then the sync handle might have
// gone stale and we need to re-initialize the sync engine
log.log("Pesistent connection errors, reinitializing connection");
sync.reset();
} }
} catch (CurlException e) { } catch (CurlException e) {
// TODO better check of type of exception from Curl log.log("Cannot initialize connection to OneDrive");
// could be either timeout of operation of connection error
// No network connection to OneDrive Service
// Don't overload notifications
log.log("No network connection to Microsoft OneDrive Service, skipping sync");
} }
// performSync complete, set lastCheckTime to current time // performSync complete, set lastCheckTime to current time
lastCheckTime = MonoTime.currTime(); lastCheckTime = MonoTime.currTime();
@ -514,8 +518,11 @@ void performSync(SyncEngine sync, string singleDirectory, bool downloadOnly, boo
} }
count = -1; count = -1;
} catch (Exception e) { } catch (Exception e) {
if (++count == 3) throw e; if (++count == 3) {
else log.log("Retrial sync count: ", count, ": ", e.msg); log.log("Giving up on sync after three attempts: ", e.msg);
throw e;
} else
log.log("Retry sync count: ", count, ": ", e.msg);
} }
} while (count != -1); } while (count != -1);
} }

5
src/sync.d
View file

@ -180,6 +180,11 @@ final class SyncEngine
session = UploadSession(onedrive, cfg.uploadStateFilePath); session = UploadSession(onedrive, cfg.uploadStateFilePath);
} }
void reset()
{
initDone=false;
}
void init() void init()
{ {
// Set accountType, defaultDriveId, defaultRootId & remainingFreeSpace once and reuse where possible // Set accountType, defaultDriveId, defaultRootId & remainingFreeSpace once and reuse where possible