X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=htetc%2Fhandler.pl;h=416ea69c471c87a26e300c7bfb96feb9de8335a6;hp=77b93463fedbe25bbf365dea3922f32dc6d0ff25;hb=aaeaf74ce3d3ceb731633a054d56a7f916ff2721;hpb=07d63243b070962b8fcf8e6b59128ccf1305f8f8 diff --git a/htetc/handler.pl b/htetc/handler.pl index 77b93463f..416ea69c4 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -6,6 +6,26 @@ use strict; use warnings; use FS::Mason qw( mason_interps ); use FS::Trace; +use FS::Conf; + +$FS::Conf::conf_cache_enabled = 1; # enable FS::Conf caching for performance + +if ( %%%RT_ENABLED%%% ) { + + require RT; + + $> = scalar(getpwnam('freeside')); + + RT::LoadConfig(); + RT::Init(); + + # disconnect DB before fork: + # (avoid 'prepared statement "dbdpg_p\d+_\d+" already exists' errors?) + $RT::Handle->dbh(undef); + undef $RT::Handle; + + $> = $<; +} #use vars qw($r); @@ -87,7 +107,6 @@ sub handler return -1 if defined( $r->content_type ) && $r->content_type !~ m!(^text/|\bxml\b)!io; - local $SIG{__WARN__}; local $SIG{__DIE__}; @@ -141,7 +160,9 @@ sub handler FS::Trace->log('done'); - FS::Trace->dumpfile("%%%FREESIDE_EXPORT%%%/profile/$$.".time, $r->filename) + FS::Trace->dumpfile( "%%%FREESIDE_EXPORT%%%/profile/$$.".time, + FS::Trace->total. ' '. $r->filename + ) if FS::Trace->total > 5; #10? FS::Trace->reset; @@ -149,19 +170,10 @@ sub handler $status; } -my $rt_initialized = 0; - sub my_rt_init { return unless $RT::VERSION; - - if ( $rt_initialized ) { - RT::ConnectToDatabase(); - RT::InitSignalHandlers(); - } else { - RT::LoadConfig(); - RT::Init(); - $rt_initialized++; - } + RT::ConnectToDatabase(); + RT::InitSignalHandlers(); } 1;