Merge 897dcfdecb
into d765bef203
This commit is contained in:
commit
f9b160d4ad
4
osync.sh
4
osync.sh
|
@ -1311,8 +1311,8 @@ $SSH_CMD error_alert=0 sync_on_changes=$sync_on_changes silent=$silent DEBUG=$DE
|
||||||
IFS=$OLD_IFS
|
IFS=$OLD_IFS
|
||||||
ENDSSH
|
ENDSSH
|
||||||
|
|
||||||
## Need to add a trivial sleep time to give ssh time to log to local file
|
child_pid=$!
|
||||||
sleep 5
|
WaitForTaskCompletion $child_pid $SOFT_MAX_EXEC_TIME $HARD_MAX_EXEC_TIME
|
||||||
|
|
||||||
## Copy back the deleted failed file list
|
## Copy back the deleted failed file list
|
||||||
ESC_SOURCE_FILE="$(EscapeSpaces "$SLAVE_STATE_DIR/$4")"
|
ESC_SOURCE_FILE="$(EscapeSpaces "$SLAVE_STATE_DIR/$4")"
|
||||||
|
|
Loading…
Reference in New Issue