Changeset 58 for trunk

Timestamp:

08/24/09 01:45:54 (1 year ago)

Author:

soergel

Message:

 

Files:

• trunk/s3napback.pl (modified) (9 diffs)

trunk/s3napback.pl

@@ -213 +213 @@
         my $block = $config;
         if ( ref($name) eq 'ARRAY' ) {
-            $logger->info( $name->[0] . " => " . $name->[1]);
+            $logger->info( $name->[0] . " => " . $name->[1] );
             $block = $config->block($name);
             $name  = $name->[1];
         }
 
-        my $frequency = $block->get("Frequency");
-        my $phase     = $block->get("Phase");
-        my $diffs     = $block->get("Diffs");
-        my $fulls     = $block->get("Fulls");
-        my @excludes  = $block->get("Exclude");
-
-        backupDirectory( $name, $frequency, $phase, $diffs, $fulls, @excludes );
+        my @excludes = $block->get("Exclude");
+
+        backupDirectory( $name, cyclespec($block), @excludes );
     }
 
@@ -233 +229 @@
         my $block = $config;
         if ( ref($name) eq 'ARRAY' ) {
-            $logger->info( $name->[0] . " => " . $name->[1]  );
+            $logger->info( $name->[0] . " => " . $name->[1] );
             $block = $config->block($name);
             $name  = $name->[1];
         }
 
-        my $frequency = $block->get("Frequency");
-        my $phase     = $block->get("Phase");
-        my $diffs     = $block->get("Diffs");
-        my $fulls     = $block->get("Fulls");
-
-        backupSubversion( $name, $frequency, $phase, $diffs, $fulls );
+        backupSubversion( $name, cyclespec($block) );
     }
 
@@ -254 +245 @@
         }
 
-        my $frequency = $block->get("Frequency");
-        my $phase     = $block->get("Phase");
-        my $diffs     = $block->get("Diffs");
-        my $fulls     = $block->get("Fulls");
-
-        backupSubversionDir( $name, $frequency, $phase, $diffs, $fulls );
+        backupSubversionDir( $name, $cyclespec ($block) );
     }
 
@@ -270 +256 @@
         }
 
-        my $frequency = $block->get("Frequency");
-        my $phase     = $block->get("Phase");
-        my $fulls     = $block->get("Fulls");
-
-        backupMysql( $name, $frequency, $phase, $fulls );
+        backupMysql( $name, cyclespec($block) );
     }
 
@@ -280 +262 @@
 
 sub backupDirectory {
-    my ( $name, $frequency, $phase, $diffs, $fulls, @excludes ) = @_;
-
-    if ( ( $yday + $phase ) % $frequency != 0 ) {
+    my ( $name, @cyclespec, @excludes ) = @_;
+    my ( $frequency, $phase, $diffs, $fulls ) = @cyclespec
+
+        if ( ( $yday + $phase ) % $frequency != 0 ) {
         $logger->warn("Skipping $name");
         return;
@@ -325 +308 @@
 
 sub backupMysql {
-    my ( $name, $frequency, $phase, $fulls ) = @_;
-
-    if ( ( $yday + $phase ) % $frequency != 0 ) {
+    my ( $name, @cyclespec ) = @_;
+
+    my ( $frequency, $phase, $diffs, $fulls ) = @cyclespec
+
+        # note $diffs is ignored
+
+        if ( ( $yday + $phase ) % $frequency != 0 ) {
         $logger->warn("Skipping $name");
         return;
@@ -376 +363 @@
 
 sub backupSubversionDir {
-    my ( $name, $frequency, $phase, $diffs, $fulls ) = @_;
+    my ( $name, @cyclespec ) = @_;
+    my ( $frequency, $phase, $diffs, $fulls ) = @cyclespec;
 
     # this will be rechecked for each individual directory, but we may as well abort now if it's the wrong day
@@ -403 +391 @@
 #
 sub backupSubversion {
-    my ( $name, $frequency, $phase, $diffs, $fulls ) = @_;
+    my ( $name, @cyclespec ) = @_;
+
+    my ( $frequency, $phase, $diffs, $fulls ) = @cyclespec;
 
     if ( ( $yday + $phase ) % $frequency != 0 ) {
@@ -517 +507 @@
 }
 
+sub cyclespec {
+    my ($block) = @_;
+
+    my $frequency = $block->get("Frequency");
+    my $phase     = $block->get("Phase");
+    my $diffs     = $block->get("Diffs");
+    my $fulls     = $block->get("Fulls");
+
+    if ( !defined $frequency ) { $frequency = 1; }
+    if ( !defined $phase )     { $phase     = 0; }
+    if ( !defined $diffs )     { $diffs     = 6; }
+    if ( !defined $fulls )     { $fulls     = 4; }
+
+    return ( $frequency, $phase, $diffs, $fulls );
+}
+
 main();