LXDebug: beim Request-Timer auch die aufgerufene Controller+Action loggen

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 77074ccd02449be8c7ad3821d4987fb428087ee0..38973216d0022e436605995da46336250a6d2900 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -324,7 +324,7 @@ sub handle_request {
     $self->{request}->Finish;
   }
 
-  $::lxdebug->end_request;
+  $::lxdebug->end_request(routing_type => $routing_type, script_name => $script_name, action => $action);
 
   # cleanup
   $::auth->save_session;

diff --git a/SL/LXDebug.pm b/SL/LXDebug.pm
index c0983aa0968252c2a5f65c89a8be3a39dd5fad76..d3ab1e53a7ec8a66089d7385385b0845fdd5d038 100644 (file)
--- a/SL/LXDebug.pm
+++ b/SL/LXDebug.pm
@@ -296,9 +296,10 @@ sub begin_request {
 }
 
 sub end_request {
-  my $self = shift;
+  my ($self, %params) = @_;
   return 1 unless want_request_timer();
-  $self->_write("time", $self->get_request_time);
+
+  $self->_write("time", sprintf('%f (%s/%s)', $self->get_request_time, $params{script_name}, $params{action}));
 
   $self->{calldepth} = 0;
 }