|
 |
25f594 |
commit ed6eb62f40cb97f71f3df4d982682de68cdf1037
|
|
|
25f594 |
Author: Stefan Jakobs <projects@localside.net>
|
|
|
25f594 |
Date: Tue May 31 23:34:11 2016 +0200
|
|
|
25f594 |
|
|
|
25f594 |
support journald as source
|
|
|
25f594 |
|
|
|
25f594 |
diff --git a/scripts/services/syslog-ng b/scripts/services/syslog-ng
|
|
|
25f594 |
old mode 100755
|
|
|
25f594 |
new mode 100644
|
|
|
25f594 |
index dcd1692..d78c835
|
|
|
25f594 |
--- a/scripts/services/syslog-ng
|
|
|
25f594 |
+++ b/scripts/services/syslog-ng
|
|
|
25f594 |
@@ -1,5 +1,5 @@
|
|
|
25f594 |
###########################################################################
|
|
|
25f594 |
-# $Id$
|
|
|
25f594 |
+# $Id: syslog-ng 280 2014-12-24 15:29:13Z stefjakobs $
|
|
|
25f594 |
###########################################################################
|
|
|
25f594 |
|
|
|
25f594 |
###########################################################################
|
|
|
25f594 |
@@ -168,7 +168,7 @@ while (defined($ThisLine = <STDIN>)) {
|
|
|
25f594 |
$Stats_dest{$processed[$i+1]} =
|
|
|
25f594 |
$Stats_dest{$processed[$i+1]} + $processed[$i+2];
|
|
|
25f594 |
} elsif ($processed[$i] eq "source" || $processed[$i] eq "src.internal" ||
|
|
|
25f594 |
- $processed[$i] eq 'src.none' ) {
|
|
|
25f594 |
+ $processed[$i] eq 'src.none' || $processed[$i] eq 'src.journald') {
|
|
|
25f594 |
$Stats_source{$processed[$i+1]} =
|
|
|
25f594 |
$Stats_source{$processed[$i+1]} + $processed[$i+2];
|
|
|
25f594 |
} elsif ($processed[$i] eq "global") {
|
|
|
25f594 |
@@ -366,7 +366,8 @@ if (keys %Stats_center || keys %Stats_dest || keys %Stats_source ||
|
|
|
25f594 |
$lost_rcvd = 0 - $Stats_center{received};
|
|
|
25f594 |
map {
|
|
|
25f594 |
# skip 'src#X' as this seams to be aggregated into 'src'
|
|
|
25f594 |
- $lost_rcvd = $lost_rcvd + $Stats_source{$_} unless ($_ =~ /src#\d+/);
|
|
|
25f594 |
+ # skip 'journal' as this is not counted.
|
|
|
25f594 |
+ $lost_rcvd = $lost_rcvd + $Stats_source{$_} unless ($_ =~ /(?:src#\d+|journal)/);
|
|
|
25f594 |
} keys %Stats_source;
|
|
|
25f594 |
}
|
|
|
25f594 |
if ($Stats_center{queued} && %Stats_dest) {
|