holm/zsync
1
1
Fork 0
forked from extern/zsync
Code Pull Requests Activity

Fix logging, remove exclude list

Browse Source
This commit is contained in:
thorsten.spille 2024-02-09 22:37:33 +01:00
parent c01a09f7db
commit d7ed15d2dd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bashclub-zsync/usr/bin/bashclub-zsync
View File

@ -196,15 +196,15 @@ for zvol in $($ssh $sshcipher $sshport $source "zfs get -H -o name,value,source
fi fi
else else
exclude_list="${exclude_list}\t${name}\n" exclude_list="${exclude_list}\t${name}\n"
if [[ $(echo $zvol | $grep "local") ]]; then # if [[ $(echo $zvol | $grep "local") ]]; then
checkzfs_filter="!#$name|$checkzfs_filter" # checkzfs_filter="!#$name|$checkzfs_filter"
fi # fi
fi fi
done done
checkzfs_filter=${checkzfs_filter::-1} checkzfs_filter=${checkzfs_filter::-1}
log "$include_list" log "$include_list"
log "$exclude_list" log "$exclude_list"
log "$checkzfs_headline\ncheckzfs_filter=$checkzfs_filter" log "$checkzfs_headline\ncheckzfs_filter=$checkzfs_filter\n"
if ! $zfs list $target > /dev/null 2>&1 ; then if ! $zfs list $target > /dev/null 2>&1 ; then
log "[DEBUG] $target does not exist. Creating..." log "[DEBUG] $target does not exist. Creating..."
@ -315,6 +315,7 @@ done
if [ $checkzfs_disabled -eq 0 ]; then if [ $checkzfs_disabled -eq 0 ]; then
log "[INFO] Running checkzfs..." log "[INFO] Running checkzfs..."
echo "<<<local>>>" > /tmp/${checkzfs_spool_maxage}_${checkzfs_prefix} echo "<<<local>>>" > /tmp/${checkzfs_spool_maxage}_${checkzfs_prefix}
if [[ $debug == "-v" ]]; then log "[DEBUG] Command:\n$checkzfs --source $source --output checkmk --threshold $checkzfs_max_age --maxsnapshots $checkzfs_max_snapshot_count --prefix $checkzfs_prefix --filter $checkzfs_filter >> /tmp/${checkzfs_spool_maxage}_${checkzfs_prefix}"; fi
$checkzfs --source $source --output checkmk --threshold $checkzfs_max_age --maxsnapshots $checkzfs_max_snapshot_count --prefix $checkzfs_prefix --filter $checkzfs_filter >> /tmp/${checkzfs_spool_maxage}_${checkzfs_prefix} $checkzfs --source $source --output checkmk --threshold $checkzfs_max_age --maxsnapshots $checkzfs_max_snapshot_count --prefix $checkzfs_prefix --filter $checkzfs_filter >> /tmp/${checkzfs_spool_maxage}_${checkzfs_prefix}
if [ $checkzfs_spool -eq 0 ]; then if [ $checkzfs_spool -eq 0 ]; then
$mv /tmp/${checkzfs_spool_maxage}_${checkzfs_prefix} /var/lib/check_mk_agent/spool/ $mv /tmp/${checkzfs_spool_maxage}_${checkzfs_prefix} /var/lib/check_mk_agent/spool/