2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index ddcad41..7651c1f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+* disable __DIE__ handler inside evals -- tobi
+
 * fix broken FPing.pm error message call -- tobi
 
 * smokeinfo: new tool to extract numeric data from a smokeping installation
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index c53b3ed..59a9ee3 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -3620,7 +3620,7 @@ sub daemonize_me ($) {
         open STDERR, '>/dev/null' or die "ERROR: Redirecting STDERR to /dev/null: $!";
         # send warnings and die messages to log
         $SIG{__WARN__} = sub { do_log ((shift)."\n") };
-        $SIG{__DIE__} = sub { do_log ((shift)."\n"); }; 
+        $SIG{__DIE__} = sub { return if $^S; do_log ((shift)."\n"); exit 1 }; 
     }
 }