Allow overriding short_message

master
Daniel Berteaud 6 years ago
parent 2791d32e7c
commit 7fe03ce1a5
  1. 8
      systemd-journal-gelf

@ -168,12 +168,14 @@ while ( my $entry = <JOURNAL> ){
# OR # OR
# #
# gelf(~):code=200~url=/index.html~remote_ip=10.99.5.12~referer=http://test.local/ # gelf(~):code=200~url=/index.html~remote_ip=10.99.5.12~referer=http://test.local/
if ( $msg->{MESSAGE} =~ m/^gelf(\([^\(\)]+\))?:([a-zA-Z\d_\-]+=([^\|])\|?)+/ ){ if ( $msg->{MESSAGE} =~ m/^gelf(\([^\(\)]+\))?:([a-zA-Z\d_\-]+=([^\|]+)\|?)+/ ){
$msg->{MESSAGE} =~ s/^gelf(\([^\(\)]+\))?://; $msg->{MESSAGE} =~ s/^gelf(\([^\(\)]+\))?://;
my $separator = ($1 && length $1 > 0) ? qr{$1} : qr{\|}; my $separator = ($1 && length $1 > 0) ? qr{$1} : qr{\|};
foreach ( split /$separator/, $msg->{MESSAGE} ){ foreach ( split /$separator/, $msg->{MESSAGE} ){
my ( $key, $val ) = split /=/, $_; my ( $key, $val ) = split /=/, $_, 2;
$gelf->{'_' . lc $key} = $val; # Allow overriding short message
$key = '_' . $key unless ($key eq 'short_message');
$gelf->{$key} = $val;
} }
} }

Loading…
Cancel
Save