X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT.pm.in;h=fafd2b7789033c451b5a2076d9845f710627ec7c;hb=aed8ec35ccb9cdeb7ea0cb6ff2946f9d83d582f6;hp=623de666fb91bff1d5597ea70f8dc5ed8f334ad5;hpb=75162bb14b3e38d66617077843f4dfdcaf09d5c4;p=freeside.git diff --git a/rt/lib/RT.pm.in b/rt/lib/RT.pm.in index 623de666f..fafd2b778 100644 --- a/rt/lib/RT.pm.in +++ b/rt/lib/RT.pm.in @@ -180,6 +180,8 @@ L and L. 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. @@ -350,39 +354,45 @@ sub InitLogging { )); } } - InitSignalHandlers(); + InitSignalHandlers(%arg); } sub InitSignalHandlers { + my %arg = @_; + # Signal handlers ## This is the default handling of warnings and die'ings in the code ## (including other used modules - maybe except for errors catched by ## 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'} ) { + + $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; + } + }; -#When we call die, trap it and log->crit with the value of the die. + #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]; - }; + $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]; + }; + + } }