Changeset 39 for trunk

Timestamp:

11/21/05 19:04:46 (19 years ago)

Author:

thauvin

Message:

• rework transfert, create md5sum file

File:

• trunk/soft/scripts/transfert (modified) (3 diffs, 1 prop)

trunk/soft/scripts/transfert

@@ -20 +20 @@
 use POSIX qw(strftime);
 use Pod::Usage;
+use Digest::MD5;
 
 # 0 .. 6 => debug, info, report, warn, error, die
@@ -184 +185 @@
 sub transfert {
     my ($entry) = @_;
-    my $rsync = $config->val($entry, 'rsync', 'rsync');
-    $rsync .= ' --log-format "TX %o %t %b %l %f"';
-    $rsync .= ' -lptgoDH';
-    $rsync .= ' ' . $config->val($entry, 'source');
-    $rsync .= ' ' . $config->val($entry, 'dest');
-    loging(0, "Rsync cmd: %s", $rsync);
-    open(my $hrsync, "$rsync |") or do {
-        loging(5, "Can exec rsync");
-        return;
+    my $source = $config->val($entry, 'source') or do {
+        loging(5, "No source defined for %s", $entry);
+        return 0;
     };
-    my @files;
-    while(my $line = <$hrsync>) {
-        my ($status, $time, $send, $size, $file) =
-            $line =~ m|^TX (\S*) (..../../.. ..:..:..) (\d+) (\d+) (.*)$|;
-        $status or next;
-        push(@files, { file => $file, size => $size });
-        loging(1, "[%s] File '%s' transmit (size: %d)", $time, $file, $size);
-    }
-    my $res = close($hrsync);
-    if ($?) {
-        loging(4, "rsync exit with non 0 status: %d", $? >> 8);
-    } else {
+
+    my $dest = $config->val($entry, 'dest') or do {
+        loging(5, "No destination defined for %s", $entry);
+        return 0;
+    };
+
+    my @files = -d $source ? glob("$source/*") : glob($source);
+    my @datafiles;
+    
+    foreach my $f (@files) {
+        if ($f =~ /.md5sum$/) {
+            loging(0, "%s is md5sum file, skipping", $f);
+            next;
+        }
+        
+        if (! -f $f) {
+            loging(0, "%s is not a regular file, skipping", $f);
+            next;
+        }
+        my ($fsize, $ftime);
+        {
+            my @st = stat($f);
+            $fsize = $st[7];
+            $ftime = $st[9];
+        }
+        
+        # Does the transfert need
+        if (-f "$f.md5sum") {
+            if ((stat("$f.md5sum"))[9] > $ftime) {
+                loging(0, "%s exists and is newer, assume transfert is not need", "$f.md5sum");
+                next;
+            }
+        }
+        
+        # Creating md5sum file
+        if(open(my $md5h, "> $f.md5sum")) {
+            if (open(my $fh, "< $f")) {
+                loging(0, "Creating %s md5 file", "$f.md5sum");
+                binmode($fh);
+                my $md5 = new Digest::MD5;
+                $md5->addfile($fh);
+                printf $md5h 
+                        "# %s\n# %s (%d octets)\n# %s\n%s  %s\n",
+                        q$Id$,
+                        $f, $fsize,
+                        scalar(localtime),
+                        $md5->hexdigest,
+                        $f;
+                close($fh);
+            } else {
+                login(5, "Can't open %s for reading", $f);
+            }
+            close($md5h);
+        } else {
+            login(5, "Can't open %s for writting", "$f.md5sum");
+        }
+
+        my $error = 0;
+        foreach my $filetotranfert (grep { -f $_ } ("$f.md5sum", $f)) {
+            my $cmd = sprintf(
+                "%s %s %s",
+                $config->val($entry, 'cmd', 'rsync -e ssh'),
+                $filetotranfert,
+                $dest,
+            );
+            loging(0, "running `%s'", $cmd);
+            if (system($cmd)) {
+                loging(4, "tranfert failed for %s, exit code: %d", $filetotranfert, $? >> 8);
+                unlink("$f.md5sum"); # ensure transfert will be retried
+                $error++;
+            }
+        }
+        
+        if ($error) {
+            loging(5, "Failed to transfert %s", $f);
+            next;
+        } else {
+            loging(1, "%s (%d) transfer ok", $f, $fsize);
+            push(@datafiles, { file => $f, size => $fsize });
+        }
+
         # No error running action:
         if (my $postrun = $config->val($entry, 'postrun')) {
             loging(0, "found postrun: %s for %s", $postrun || '(unset)', $entry);
-            foreach my $f (@files) {
-                my $filename = "/$f->{file}";
-                my $fpostrun = sprintf($postrun, $filename);
+            foreach my $filetotranfert (grep { -f $_ } ("$f.md5sum", $f)) {
+                my $fpostrun = sprintf($postrun, $filetotranfert);
                 loging(0, "Running `%s'", $fpostrun);
                 my $postrunres = system($fpostrun);
-                
+                loging(0, "Postrun exit: %d", $postrunres);
             }
         }
     }
+
     my $totalsize = 0;
-    $totalsize += $_->{size} foreach (@files);
-    loging(2, "%s: %d file transmit, %d octets", $entry, scalar(@files), $totalsize);
+    $totalsize += $_->{size} foreach (@datafiles);
+    loging(2, "%s: %d file transmit, %d octets", $entry, scalar(@datafiles), $totalsize);
+    
     return 0;
 }
@@ -257 +322 @@
 
     $Log$
+    Revision 1.6  2005/11/21 18:04:46  thauvin
+    - rework transfert, create md5sum file
+
     Revision 1.5  2005/11/18 18:40:27  thauvin
     - add postrun doc