Changeset 11 for shepherd

Timestamp:

10/04/06 16:31:20 (7 years ago)

Author:

lincoln

Message:

custom DIE() handler to catch die statements in XMLTV and XML::Parser modules because wrapping in eval{} didn't actually work right. bit of an ugly hack but seems to work well.

Files:

• shepherd (modified) (3 diffs)

shepherd

@@ -30 +30 @@
 # * --ready  option that says whether config is required?
 
+BEGIN { *CORE::GLOBAL::die = \&my_die; }
 use strict;
 use LWP::Simple;
@@ -262 +263 @@
     my $parse_start_time = [gettimeofday];
     printf STDERR "SHEPHERD: Started parsing XMLTV from '%s' in '%s' .. any errors below are from parser:\n",$plugin,$output;
-    eval {
-        local $SIG{__DIE__}, 
-        $plugin_data->{$plugin}->{xmltv} = XMLTV::parsefiles($output);
-    };
-    printf STDERR "SHEPHERD: Warning: Parser returned the following: $@\n" if $@;
+    eval { $plugin_data->{$plugin}->{xmltv} = XMLTV::parsefiles($output); };
     printf STDERR "SHEPHERD: Completed XMLTV parsing from '%s' in %0.2f seconds\n",$plugin,tv_interval($parse_start_time);
 
@@ -1122 +1119 @@
 }
 
+# -----------------------------------------
+# Subs: override handlers for standard perl.
+# -----------------------------------------
+
+# ugly hack. please don't try this at home kids!
+sub my_die {
+    my ($arg,@rest) = @_;
+    my ($pack,$file,$line,$sub) = caller(1);
+
+    # check if we are in an eval()
+    if ($^S) {
+        printf STDERR "  shepherd caught a die() within eval{} from file $file line $line\n";
+    } else {
+        if (!ref($arg)) {
+            CORE::die((sprintf "DIE at line %d in file %s: %s\n",$line,$file,(join("",($arg,@rest)))));
+        } else {
+            CORE::die($arg,@rest);
+        }
+    }
+}
+