Changeset 2066 for trunk/server/fedora/config/etc/syslog-ng

Timestamp:

Nov 22, 2011, 12:45:17 AM (12 years ago)

Author:

achernya

Message:

Merge branches/fc15-dev to trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• server/fedora/config/etc/syslog-ng/d_zroot.pl (modified) (4 diffs)
• server/fedora/config/etc/syslog-ng/syslog-ng.conf (modified) (4 diffs)

trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl

@@ -32 +32 @@
 sub buildKeyMap($) {
     my ($file) = @_;
-    open (KEYS, $file) or warn "Couldn't open $file: $!";
+    open (KEYS, $file) or (warn "Couldn't open $file: $!\n" and return);
     while (<KEYS>) {
         chomp;
@@ -58 +58 @@
 buildKeyMap("/root/.ssh/authorized_keys2");
 
-while (1) {
-    my @message = scalar(<>);
+my @message;
+
+while (my $line = <>) {
+    @message = $line;
     eval {
         local $SIG{ALRM} = sub { die "alarm\n" }; # NB: \n required
@@ -80 +82 @@
         } elsif ($message =~ m|Root (\S+) shell|) {
             sendmsg($message);
-        } elsif ($message =~ m|session \S+ for user (\S+)|) {
-            sendmsg($message) if exists $USERS{$1};
+        } elsif ($message =~ m|pam_unix\(([^:]+):session\): session \S+ for user (\S+)|) {
+            sendmsg($message) if $1 ne "cron" and exists $USERS{$2};
         } elsif ($message =~ m|^Found matching (\w+) key: (\S+)|) {
             if ($sshkeys{$2}) {
@@ -117 +119 @@
         } elsif ($message =~ m|^ *root : TTY=|) {
         } elsif ($message =~ m|^Set /proc/self/oom_adj to |) {
+        } elsif ($message =~ m|^fatal: mm_request_receive: read: Connection reset by peer$|) {
         } else {
             sendmsg($message, "scripts-spew");

trunk/server/fedora/config/etc/syslog-ng/syslog-ng.conf

@@ +1 @@
+@version:3.2
+
 # syslog-ng configuration file.
 #
@@ -8 +10 @@
 
 options {
-        sync (0);
+        flush_lines (0);
         time_reopen (10);
         log_fifo_size (1000);
@@ -16 +18 @@
         create_dirs (no);
         keep_hostname (yes);
+        stats_freq (0);
 };
 
 source s_sys {
-        file ("/proc/kmsg" log_prefix("kernel: "));
+        file ("/proc/kmsg" program_override("kernel: "));
         unix-stream ("/dev/log");
         internal();
@@ -28 +31 @@
 destination d_mesg { file("/var/log/messages"); };
 destination d_auth { file("/var/log/secure"); };
-destination d_mail { file("/var/log/maillog" sync(10)); };
+destination d_mail { file("/var/log/maillog" flush_lines(10)); };
 destination d_spol { file("/var/log/spooler"); };
 destination d_boot { file("/var/log/boot.log"); };