Requests nicht timen, wenn begin_request nicht aufgerufen wurde.

[mfinanz.git] / SL / LXDebug.pm

diff --git a/SL/LXDebug.pm b/SL/LXDebug.pm
index 7d98040cc851c65bf905b6e4326400590b961d14..43ad76a99375558c7277d9c4821b4339e865b21c 100644 (file)
--- a/SL/LXDebug.pm
+++ b/SL/LXDebug.pm
@@ -14,7 +14,7 @@ use constant DEVEL              => INFO | QUERY | TRACE | BACKTRACE_ON_ERROR | R
 use constant FILE_TARGET   => 0;
 use constant STDERR_TARGET => 1;
 
 use constant FILE_TARGET   => 0;
 use constant STDERR_TARGET => 1;
 

-use POSIX qw(strftime);
+use POSIX qw(strftime getppid);

 use Time::HiRes qw(gettimeofday tv_interval);
 use YAML;
 
 use Time::HiRes qw(gettimeofday tv_interval);
 use YAML;
 


@@ -75,7 +75,7 @@ sub enter_sub {
   my ($dummy1, $self_filename, $self_line) = caller(0);
 
   my $indent = " " x $self->{"calldepth"}++;
   my ($dummy1, $self_filename, $self_line) = caller(0);
 
   my $indent = " " x $self->{"calldepth"}++;

-  my $time = $self->want_request_timer ? $self->get_request_time : '';
+  my $time = $self->get_request_time || '';

 
   if (!defined($package)) {
     $self->_write('sub' . $level, $indent . "\\ $time top-level?\n");
 
   if (!defined($package)) {
     $self->_write('sub' . $level, $indent . "\\ $time top-level?\n");


@@ -211,7 +211,7 @@ sub is_tracing_enabled {
 
 sub _write {
   my ($self, $prefix, $message) = @_;
 
 sub _write {
   my ($self, $prefix, $message) = @_;

-  my $date = strftime("%Y-%m-%d %H:%M:%S $$ ${prefix}: ", localtime(time()));
+  my $date = strftime("%Y-%m-%d %H:%M:%S $$ [" . getppid() . "] ${prefix}: ", localtime(time()));

   local *FILE;
 
   chomp($message);
   local *FILE;
 
   chomp($message);


@@ -247,7 +247,7 @@ sub end_request {
 
 sub get_request_time {
   my $self = shift;
 
 sub get_request_time {
   my $self = shift;

-  tv_interval($self->{request_start});
+  return $self->want_request_timer && $self->{request_start} ? tv_interval($self->{request_start}) : undef;

 }
 
 sub set_request_timer {
 }
 
 sub set_request_timer {