rsync-backup.in: Factor out log file expiry into a separate function.

No real use for this yet, but it's tidier this way.

diff --git a/rsync-backup.in b/rsync-backup.in
index d7267cad268f2ecf359d024cc26cd5e31551cc9a..a9145d66bfa897a93ddb8fe17a381788d3f129e0 100644 (file)
--- a/rsync-backup.in
+++ b/rsync-backup.in
@@ -177,6 +177,30 @@ runhook () {
   done
 }
 
   done
 }
 

+remove_old_logfiles () {
+  base=$1
+  ## Remove old logfiles with names of the form BASE.DATE#N, so that there
+  ## are at most $MAXLOG of them.
+
+  ## Count up the logfiles.
+  nlog=0
+  for i in "$base".*; do
+    if [ ! -f "$i" ]; then continue; fi
+    nlog=$(( nlog + 1 ))
+  done
+
+  ## If there are too many, go through and delete some early ones.
+  if [ $dryrun = nil ] && [ $nlog -gt $MAXLOG ]; then
+    n=$(( nlog - MAXLOG ))
+    for i in "$base".*; do
+      if [ ! -f "$i" ]; then continue; fi
+      rm -f "$i"
+      n=$(( n - 1 ))
+      if [ $n -eq 0 ]; then break; fi
+    done
+  fi
+}
+

 ###--------------------------------------------------------------------------
 ### Database operations.
 
 ###--------------------------------------------------------------------------
 ### Database operations.
 


@@ -744,23 +768,8 @@ run_backup_cmd () {
     bkprc=1
   fi
 
     bkprc=1
   fi
 

-  ## Count up the logfiles.
-  nlog=0
-  for i in "$logdir/$host/$fs".*; do
-    if [ ! -f "$i" ]; then continue; fi
-    nlog=$(( nlog + 1 ))
-  done
-
-  ## If there are too many, go through and delete some early ones.
-  if [ $dryrun = nil ] && [ $nlog -gt $MAXLOG ]; then
-    n=$(( nlog - MAXLOG ))
-    for i in "$logdir/$host/$fs".*; do
-      if [ ! -f "$i" ]; then continue; fi
-      rm -f "$i"
-      n=$(( n - 1 ))
-      if [ $n -eq 0 ]; then break; fi
-    done
-  fi
+  ## Clear away any old logfiles.
+  remove_old_logfiles "$logdir/$host/$fs"

 }
 
 backup () {
 }
 
 backup () {