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

Fix unhandled monitor initialisation exception (Issue #704) (#705)

Browse source 
* Catch MonitorException when initialisation failure occurs, print error and exit ... cant enter monitor loop if we cant initialise correctly.
* Cleanup and add documentation update
This commit is contained in:
abraunegg 2019-10-30 17:46:02 +11:00 committed by GitHub
parent 9b3179540f
commit 12947d160f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 95 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
docs/USAGE.md
View file

@ -427,6 +427,31 @@ Currently not supported.
### SharePoint / Office 365 Shared Libraries ### SharePoint / Office 365 Shared Libraries
Refer to [./Office365.md](Office365.md) for configuration assistance. Refer to [./Office365.md](Office365.md) for configuration assistance.
## Running 'onedrive' in 'monitor' mode
Monitor mode (`--monitor`) allows the onedrive process to continually monitor your local file system for changes to files.
Two common errors can occur when using monitor mode:
* Intialisation failure
* Unable to add a new inotify watch
Both of these errors are local environment issues, where the following system variables need to be increased as the current system values are potentially too low:
* `fs.file-max`
* `fs.inotify.max_user_watches`
To determine what these values are on your system use the following commands:
```
sysctl fs.file-max
sysctl fs.inotify.max_user_watches
```
To make a change to these variables:
```
sudo sysctl fs.file-max=<new_value>
sudo sysctl fs.inotify.max_user_watches=<new_value>
```
To make these changes permanent, refer to your OS reference documentation.
## Running 'onedrive' as a system service ## Running 'onedrive' as a system service
There are two ways that onedrive can be used as a service There are two ways that onedrive can be used as a service
* via init.d * via init.d

131
src/main.d
View file

@ -671,72 +671,81 @@ int main(string[] args)
signal(SIGINT, &exitHandler); signal(SIGINT, &exitHandler);
signal(SIGTERM, &exitHandler); signal(SIGTERM, &exitHandler);
// initialise the monitor class // attempt to initialise monitor class
if (!cfg.getValueBool("download_only")) m.init(cfg, cfg.getValueLong("verbose") > 0, cfg.getValueBool("skip_symlinks"), cfg.getValueBool("check_nosync")); try {
// monitor loop m.init(cfg, cfg.getValueLong("verbose") > 0, cfg.getValueBool("skip_symlinks"), cfg.getValueBool("check_nosync"));
immutable auto checkInterval = dur!"seconds"(cfg.getValueLong("monitor_interval")); } catch (MonitorException e) {
immutable auto logInterval = cfg.getValueLong("monitor_log_frequency"); // monitor initialisation failed
immutable auto fullScanFrequency = cfg.getValueLong("monitor_fullscan_frequency"); log.error("ERROR: ", e.msg);
auto lastCheckTime = MonoTime.currTime(); exit(-1);
auto logMonitorCounter = 0; }
auto fullScanCounter = 0;
bool fullScanRequired = true; if (!cfg.getValueBool("download_only")) {
bool syncListConfiguredOverride = false; // monitor loop
while (true) { immutable auto checkInterval = dur!"seconds"(cfg.getValueLong("monitor_interval"));
if (!cfg.getValueBool("download_only")) m.update(online); immutable auto logInterval = cfg.getValueLong("monitor_log_frequency");
auto currTime = MonoTime.currTime(); immutable auto fullScanFrequency = cfg.getValueLong("monitor_fullscan_frequency");
if (currTime - lastCheckTime > checkInterval) { auto lastCheckTime = MonoTime.currTime();
// log monitor output suppression auto logMonitorCounter = 0;
logMonitorCounter += 1; auto fullScanCounter = 0;
if (logMonitorCounter > logInterval) bool fullScanRequired = true;
logMonitorCounter = 1; bool syncListConfiguredOverride = false;
while (true) {
// full scan of sync_dir if (!cfg.getValueBool("download_only")) m.update(online);
fullScanCounter += 1; auto currTime = MonoTime.currTime();
if (fullScanCounter > fullScanFrequency){ if (currTime - lastCheckTime > checkInterval) {
fullScanCounter = 1; // log monitor output suppression
fullScanRequired = true; logMonitorCounter += 1;
if (syncListConfigured) { if (logMonitorCounter > logInterval)
syncListConfiguredOverride = true; logMonitorCounter = 1;
}
} // full scan of sync_dir
fullScanCounter += 1;
// log.logAndNotify("DEBUG trying to create checkpoint"); if (fullScanCounter > fullScanFrequency){
// auto res = itemdb.db_checkpoint(); fullScanCounter = 1;
// log.logAndNotify("Checkpoint return: ", res); fullScanRequired = true;
// itemdb.dump_open_statements(); if (syncListConfigured) {
syncListConfiguredOverride = true;
try { }
if (!initSyncEngine(sync)) {
oneDrive.http.shutdown();
return EXIT_FAILURE;
} }
// log.logAndNotify("DEBUG trying to create checkpoint");
// auto res = itemdb.db_checkpoint();
// log.logAndNotify("Checkpoint return: ", res);
// itemdb.dump_open_statements();
try { try {
// perform a --monitor sync if (!initSyncEngine(sync)) {
performSync(sync, cfg.getValueString("single_directory"), cfg.getValueBool("download_only"), cfg.getValueBool("local_first"), cfg.getValueBool("upload_only"), (logMonitorCounter == logInterval ? MONITOR_LOG_QUIET : MONITOR_LOG_SILENT), fullScanRequired, syncListConfiguredOverride); oneDrive.http.shutdown();
if (!cfg.getValueBool("download_only")) { return EXIT_FAILURE;
// discard all events that may have been generated by the sync }
m.update(false); try {
// perform a --monitor sync
performSync(sync, cfg.getValueString("single_directory"), cfg.getValueBool("download_only"), cfg.getValueBool("local_first"), cfg.getValueBool("upload_only"), (logMonitorCounter == logInterval ? MONITOR_LOG_QUIET : MONITOR_LOG_SILENT), fullScanRequired, syncListConfiguredOverride);
if (!cfg.getValueBool("download_only")) {
// 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("Persistent connection errors, reinitializing connection");
sync.reset();
} }
} catch (CurlException e) { } catch (CurlException e) {
// we already tried three times in the performSync routine log.log("Cannot initialize connection to OneDrive");
// if we still have problems, then the sync handle might have
// gone stale and we need to re-initialize the sync engine
log.log("Persistent connection errors, reinitializing connection");
sync.reset();
} }
} catch (CurlException e) { // performSync complete, set lastCheckTime to current time
log.log("Cannot initialize connection to OneDrive"); fullScanRequired = false;
} if (syncListConfigured) {
// performSync complete, set lastCheckTime to current time syncListConfiguredOverride = false;
fullScanRequired = false; }
if (syncListConfigured) { lastCheckTime = MonoTime.currTime();
syncListConfiguredOverride = false; GC.collect();
} }
lastCheckTime = MonoTime.currTime(); Thread.sleep(dur!"msecs"(500));
GC.collect(); }
}
Thread.sleep(dur!"msecs"(500));
} }
} }
} }