Changeset 27244

Timestamp:

Mar 10, 2010, 5:25:28 PM (16 years ago)

Author:

Paul Price

Message:

Better error handling on bad log names, and fix log name for magic.

File:

• trunk/tools/errors.pl (modified) (3 diffs)

trunk/tools/errors.pl

@@ -57 +57 @@
     $table = "warpSkyfile";
 } elsif ($stage eq "magic") {
-    $sql = "SELECT magic_id, node, 'unknown' AS hostname, CONCAT(workdir, '.', node) FROM magicRun JOIN magicNodeResult USING(magic_id) WHERE magicNodeResult.fault != 0";
+    $sql = "SELECT magic_id, node, 'unknown' AS hostname, CONCAT(workdir, '/', exp_id, '/', exp_id, '.', node) FROM magicRun JOIN magicNodeResult USING(magic_id) WHERE magicNodeResult.fault != 0";
     $table = "magicNodeResult";
 } else {
@@ -102 +102 @@
     if ($log =~ /^neb:/) {
         my $new = eval { $neb->find($log); };
-        $bad{$name} = $log unless $new;
+        unless ($new) {
+            $bad{$name} = $log;
+            next;
+        }
         $log = $new;
     }
@@ -108 +111 @@
     my $file;                   # Log file
     open $file, $log;
+    unless ($file) {
+        $bad{$name} = $log;
+        next;
+    }
     my @log = <$file>;          # Contents of log file
     close $file;