MT#7705 - add "$data" argument into log methods to manually pass data if required. remove trailing whitespaces

agranig/webphone
Kirill Solomko 11 years ago
parent a016298e87
commit a90de685e9

@ -7,7 +7,7 @@ use DateTime qw();
use DateTime::Format::RFC3339 qw();
use Time::HiRes qw();
method get_log_params ($self: Catalyst :$c) {
method get_log_params ($self: Catalyst :$c, :$data?) {
# get log_tx_id, caller method, remote user, formatted passed parameters
# tx_id
@ -36,11 +36,11 @@ method get_log_params ($self: Catalyst :$c) {
$r_ip =~ s/^::ffff://; # ipv4 in ipv6 form -> ipv4
# parameters
my $data = Data::Dumper->new([$c->request->parameters])
my $data_str = Data::Dumper->new([ $data ? $data : $c->request->parameters ])
->Terse(1)
->Dump;
$data =~ s/\n//g;
$data =~ s/\s+/ /g;
$data_str =~ s/\n//g;
$data_str =~ s/\s+/ /g;
unless ($c->config->{logging}->{clear_passwords}) {
}
@ -50,15 +50,15 @@ method get_log_params ($self: Catalyst :$c) {
called => $called,
r_user => $r_user,
r_ip => $r_ip,
data => $data,
data => $data_str,
};
}
method error ($self: Catalyst :$c, Str :$desc, Str :$log?, :$error?) {
method error ($self: Catalyst :$c, Str :$desc, Str :$log?, :$error?, :$data?) {
# we explicitly declare the invocant to skip the validation for Object
# because we want a class method instead of an object method
my $log_params = $self->get_log_params(c => $c);
my $log_params = $self->get_log_params(c => $c, data => $data);
my $log_msg = '';
my $usr_type = 'error';
@ -114,11 +114,11 @@ EOF
return;
}
method info ($self: Catalyst :$c, Str :$desc, Str :$log?) {
method info ($self: Catalyst :$c, Str :$desc, Str :$log?, :$data?) {
# we explicitly declare the invocant to skip the validation for Object
# because we want a class method instead of an object method
my $log_params = $self->get_log_params(c => $c);
my $log_params = $self->get_log_params(c => $c, data => $data);
my $log_msg = '';
my $usr_type = 'info';

Loading…
Cancel
Save