Revert the config & logpath change and check correct input entry (#1270)

* Revert the config & logpath change introduced via #1267 as the logging path should not be the value checked, the input path is what should be checked
This commit is contained in:
abraunegg 2021-02-13 17:37:22 +11:00 committed by GitHub
parent 3ba8bb165a
commit 3ea16b619f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions

View file

@ -453,8 +453,6 @@ int main(string[] args)
// vdebug syncDir as set and calculated
log.vdebug("syncDir: ", syncDir);
// As we use the cfg value of sync_dir elsewhere, and if it includes a ~ it is now correctly expanded, update the configuration with new expanded value
cfg.setValueString("sync_dir", syncDir);
// Configure the logging directory if different from application default
// log_dir environment handling to handle ~ expansion properly

View file

@ -2973,7 +2973,7 @@ final class SyncEngine
}
// scan for changes in the path provided
if (isDir(logPath)) {
if (isDir(path)) {
// if this path is a directory, output this message.
// if a file, potentially leads to confusion as to what the client is actually doing
log.vlog("Uploading differences of ", logPath);
@ -3095,7 +3095,7 @@ final class SyncEngine
}
// scan for changes in the path provided
if (isDir(logPath)) {
if (isDir(path)) {
// if this path is a directory, output this message.
// if a file, potentially leads to confusion as to what the client is actually doing
log.vlog("Uploading new items of ", logPath);