add NoSignalHandlers option to RT::Init() so we can pull things up the way we want...

[freeside.git] / rt / lib / RT.pm.in

diff --git a/rt/lib/RT.pm.in b/rt/lib/RT.pm.in
index f0e56e8..a5f8e01 100644 (file)
--- a/rt/lib/RT.pm.in
+++ b/rt/lib/RT.pm.in
@@ -180,6 +180,8 @@ L<preloads classes /InitClasses> and L<set up logging /InitLogging>.
 
 sub Init {
 
+    my @arg = @_;
+
     CheckPerlRequirements();
 
     InitPluginPaths();
@@ -188,7 +190,7 @@ sub Init {
     ConnectToDatabase();
     InitSystemObjects();
     InitClasses();
-    InitLogging(); 
+    InitLogging(@arg); 
     InitPlugins();
     RT->Config->PostLoadCheck;
 
@@ -215,6 +217,8 @@ Create the Logger object and set up signal handlers.
 
 sub InitLogging {
 
+    my %arg = @_;
+
     # We have to set the record separator ($, man perlvar)
     # or Log::Dispatch starts getting
     # really pissy, as some other module we use unsets it.
@@ -358,28 +362,32 @@ sub InitLogging {
 ## Mason).  It will log all problems through the standard logging
 ## mechanism (see above).
 
-    $SIG{__WARN__} = sub {
-        # The 'wide character' warnings has to be silenced for now, at least
-        # until HTML::Mason offers a sane way to process both raw output and
-        # unicode strings.
-        # use 'goto &foo' syntax to hide ANON sub from stack
-        if( index($_[0], 'Wide character in ') != 0 ) {
-            unshift @_, $RT::Logger, qw(level warning message);
-            goto &Log::Dispatch::log;
-        }
-    };
+    unless ( $arg{'NoSignalHandlers'} ) {
 
-#When we call die, trap it and log->crit with the value of the die.
+        $SIG{__WARN__} = sub {
+            # The 'wide character' warnings has to be silenced for now, at least
+            # until HTML::Mason offers a sane way to process both raw output and
+            # unicode strings.
+            # use 'goto &foo' syntax to hide ANON sub from stack
+            if( index($_[0], 'Wide character in ') != 0 ) {
+                unshift @_, $RT::Logger, qw(level warning message);
+                goto &Log::Dispatch::log;
+            }
+        };
 
-    $SIG{__DIE__}  = sub {
-        # if we are not in eval and perl is not parsing code
-        # then rollback transactions and log RT error
-        unless ($^S || !defined $^S ) {
-            $RT::Handle->Rollback(1) if $RT::Handle;
-            $RT::Logger->crit("$_[0]") if $RT::Logger;
-        }
-        die $_[0];
-    };
+        #When we call die, trap it and log->crit with the value of the die.
+
+        $SIG{__DIE__}  = sub {
+            # if we are not in eval and perl is not parsing code
+            # then rollback transactions and log RT error
+            unless ($^S || !defined $^S ) {
+                $RT::Handle->Rollback(1) if $RT::Handle;
+                $RT::Logger->crit("$_[0]") if $RT::Logger;
+            }
+            die $_[0];
+        };
+
+    }
 }