From c3554cac89f96c31db0f4a122541a9ab80a85611 Mon Sep 17 00:00:00 2001 From: Gocnak Date: Mon, 29 Oct 2018 00:23:15 -0400 Subject: [PATCH 1/5] Use compression (-z) with rsync This was dropped during the great merge of '18 --- run/rsync_archive/archive-clips.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/rsync_archive/archive-clips.sh b/run/rsync_archive/archive-clips.sh index 29f5a55..4bd8e4b 100644 --- a/run/rsync_archive/archive-clips.sh +++ b/run/rsync_archive/archive-clips.sh @@ -4,7 +4,7 @@ log "Archiving through rsync..." source /root/.teslaCamRsyncConfig -num_files_moved=$(rsync -auvh --stats --log-file=/tmp/archive-rsync-cmd.log /mnt/cam/TeslaCam/saved* $user@$server:$path | awk '/files transferred/{print $NF}') +num_files_moved=$(rsync -auzvh --stats --log-file=/tmp/archive-rsync-cmd.log /mnt/cam/TeslaCam/saved* $user@$server:$path | awk '/files transferred/{print $NF}') /root/bin/send-pushover "$num_files_moved" From f15d59702586417a5677440f61779af46cff80ed Mon Sep 17 00:00:00 2001 From: Gocnak Date: Mon, 29 Oct 2018 00:54:19 -0400 Subject: [PATCH 2/5] 10-try retry the disconnect check Also lost in the great merge of '18 --- run/archiveloop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/archiveloop b/run/archiveloop index 9b8674f..81b313a 100644 --- a/run/archiveloop +++ b/run/archiveloop @@ -159,7 +159,7 @@ function wait_for_archive_to_be_unreachable () { log "Waiting for archive to be unreachable..." while [ true ] do - if ! archive_is_reachable + if ! retry archive_is_reachable then log "Archive is unreachable." break From 636b1a1819a618f671e80a3195d7d99d74fd3214 Mon Sep 17 00:00:00 2001 From: Gocnak Date: Mon, 29 Oct 2018 01:32:17 -0400 Subject: [PATCH 3/5] Disregard copying perms to catch another edge case Pesky, was caught up trying to copy permissions over and didn't really need to --- run/rsync_archive/archive-clips.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/rsync_archive/archive-clips.sh b/run/rsync_archive/archive-clips.sh index 4bd8e4b..a87369f 100644 --- a/run/rsync_archive/archive-clips.sh +++ b/run/rsync_archive/archive-clips.sh @@ -4,7 +4,7 @@ log "Archiving through rsync..." source /root/.teslaCamRsyncConfig -num_files_moved=$(rsync -auzvh --stats --log-file=/tmp/archive-rsync-cmd.log /mnt/cam/TeslaCam/saved* $user@$server:$path | awk '/files transferred/{print $NF}') +num_files_moved=$(rsync -auzvh --no-perms --stats --log-file=/tmp/archive-rsync-cmd.log /mnt/cam/TeslaCam/saved* $user@$server:$path | awk '/files transferred/{print $NF}') /root/bin/send-pushover "$num_files_moved" From a9bcb5c1adf3eb5189ef5359ff023421e006d6d7 Mon Sep 17 00:00:00 2001 From: Gocnak Date: Mon, 29 Oct 2018 01:33:31 -0400 Subject: [PATCH 4/5] Remove experimental warning from README Works on my end, and has worked before the great '18 merge as well --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c68bd7e..fe17fbd 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ Whichever instructions you followed above will leave you in a command shell on t ### Set up the archive for dashcam clips Follow the instructions corresponding to the technology you'd like to use to host the archive for your dashcam clips. You must choose just one of these technoloies; don't follow more than one of these sets of instructions: * Windows file share, MacOS Sharing, or Samba on Linux: [Instructions](doc/SetupShare.md). -* SFTP/rsync: [Instructions](doc/SetupRsync.md) +* SFTP/rsync: [Instructions](doc/pi/SetupRSync.md) * **Experimental:** Google Drive, Amazon S3, DropBox, Microsoft OneDrive: [Instructions](doc/SetupRClone.md) ### Set up the USB storage functionality From 7d9b838420733c8b756d2e8b6fb6f4de45bbe50f Mon Sep 17 00:00:00 2001 From: Gocnak Date: Mon, 29 Oct 2018 01:43:58 -0400 Subject: [PATCH 5/5] Fixed path to instructions for rsync --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fe17fbd..ae8c449 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ Whichever instructions you followed above will leave you in a command shell on t ### Set up the archive for dashcam clips Follow the instructions corresponding to the technology you'd like to use to host the archive for your dashcam clips. You must choose just one of these technoloies; don't follow more than one of these sets of instructions: * Windows file share, MacOS Sharing, or Samba on Linux: [Instructions](doc/SetupShare.md). -* SFTP/rsync: [Instructions](doc/pi/SetupRSync.md) +* SFTP/rsync: [Instructions](doc/SetupRSync.md) * **Experimental:** Google Drive, Amazon S3, DropBox, Microsoft OneDrive: [Instructions](doc/SetupRClone.md) ### Set up the USB storage functionality