MT#7705 - Remove newline from log strings passed to the logger

changes/94/294/1
Kirill Solomko 11 years ago
parent 22225a3b8d
commit 79d39d7926

@ -161,10 +161,9 @@ method error ($self: Catalyst :$c, Str :$desc, :$log?, :$error?, :$type = 'panel
$msg = "$desc ($error)";
}
my $logstr = 'IP=%s CALLED=%s TX=%s USER=%s DATA=%s MSG="%s" LOG="%s"';
my $rc = $c->log->error(
sprintf <<"EOF", @{$log_params}{qw(r_ip called tx_id r_user data)}, $msg, $log_msg);
IP=%s CALLED=%s TX=%s USER=%s DATA=%s MSG="%s" LOG="%s"
EOF
sprintf $logstr, @{$log_params}{qw(r_ip called tx_id r_user data)}, $msg, $log_msg);
if ($type eq 'panel') {
$c->flash(messages => [{ type => $usr_type,
text => sprintf '%s [%s]',
@ -206,10 +205,10 @@ method info ($self: Catalyst :$c, Str :$desc, :$log?, :$type = 'panel', :$data?,
$log_msg =~ s/\s+/ /g;
}
my $logstr = 'IP=%s CALLED=%s TX=%s USER=%s DATA=%s MSG="%s" LOG="%s"';
my $rc = $c->log->info(
sprintf <<"EOF", @{$log_params}{qw(r_ip called tx_id r_user data)}, $msg, $log_msg);
IP=%s CALLED=%s TX=%s USER=%s DATA=%s MSG="%s" LOG="%s"
EOF
sprintf $logstr,
@{$log_params}{qw(r_ip called tx_id r_user data)}, $msg, $log_msg);
if ($type eq 'panel') {
$c->flash(messages => [{ type => $usr_type, text => $usr_text }]);
}

Loading…
Cancel
Save