Changeset 32377

Timestamp:

Sep 8, 2011, 3:05:49 PM (15 years ago)

Author:

bills

Message:

From Trunk: Added method redirect_to_logfile to PS::IPP::Config class. This checks for an existing log file.
If found renames it by appending a date string, then redirects STDOUT and STDERR to the new log file.
The name of the renamed file is included in the log.
In chip_imfile.pl use the new function and stop passing the -log parameter to ppImage. This should
lead to a consistent log output.

File:

• tags/ipp-20110622/PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (5 diffs, 1 prop)

tags/ipp-20110622/PS-IPP-Config/lib/PS/IPP/Config.pm

@@ -20 +20 @@
 use Getopt::Long 2.33 qw( GetOptions :config gnu_getopt pass_through ); # Set pass_through so we don't kill @ARGV
 use IPC::Cmd 0.36 qw( can_run run );
+use POSIX qw( strftime );
 
 use base qw( Exporter Class::Accessor::Fast );
@@ -40 +41 @@
                     metadataLookupBool
                     metadataLookupS32
+                    metadataLookupF32
                     caturi
                     file_scheme
@@ -691 +693 @@
 }
 
+
+
 # redirect stderr and stdout streams to a file
 sub redirect_output
@@ -721 +725 @@
 
     return 1;
+}
+
+# redirect stderr and stdout streams to log file. If file already exists rename it and record
+# the name in the new log file.
+sub redirect_to_logfile {
+    my $self = shift;
+    my $name = shift;
+    
+    my $tstring = strftime "%Y%m%dT%H%M", gmtime;
+
+    my $old_name;
+    my $scheme = file_scheme($name);
+    if ($scheme eq 'neb') {
+        my $neb = $self->nebulous;
+        if ($neb->storage_object_exists($name)) {
+            eval {
+                $old_name = "$name.$tstring";
+                $neb->move($name, $old_name);
+            };
+            if ($@) {
+                carp "nebulous move failed for $name";
+                return undef;
+            }
+        }
+    } else {
+        if ($self->file_exists($name)) {
+            my $resolved = $self->file_resolve($name);
+            $old_name = "$resolved.$tstring";
+            if (!rename($resolved, $old_name)) {
+                carp "Failed to rename $resolved $old_name";
+                return undef;
+            }
+        }
+    }
+    my $result = $self->redirect_output($name);
+    if ($result and $old_name) {
+        print "\nPrevious log file moved to $old_name\n";
+    }
+    return $result;
 }
 
@@ -1576 +1619 @@
 }
 
+# Lookup the metadata, checking the type is F32
+sub metadataLookupF32
+{
+    my $item = metadataLookup(@_);
+    return undef if not defined $item;
+    my $name = shift;                # Name of item
+    carp "$name within metadata is type $item->{type} not F32.\n" unless $item->{type} eq "F32";
+    return $item->{value};
+}
+
 # Lookup the metadata, checking the type is MD
 sub metadataLookupMD