diff options
| author | Phil Davis <phil.davis@inf.org> | 2015-12-06 22:58:31 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2015-12-06 22:58:31 +0545 |
| commit | 026e2441bb9dd459478074d26442a272ecb5ed4a (patch) | |
| tree | dcdab8d86c0d3332c82c6c699ff57fd571a58f88 | |
| parent | 2bfa7dbfb4fe8981c84d03d417b7c486a0973ea5 (diff) | |
| download | pfsense-026e2441bb9dd459478074d26442a272ecb5ed4a.zip pfsense-026e2441bb9dd459478074d26442a272ecb5ed4a.tar.gz | |
Fix duplicate syslog messages - Redmine #5606 for RELENG_2_2
The generated syslog.conf needs to have the system.log selections combined into a single line in 2 places. The OP on redmine 5606 just showed 1 place in the diff there.
On my system, this gets rid of the duplicated message on login:
php-fpm[11074]: /index.php: Successful login for user 'my.name' from: 10.11.12.13
Note: for some reason old line 848 includes local4.none - but local4.none does not appear in old line 864. What is that about? Is that another different bug?
I did not mess with that, but I noticed that the OPs diff listing did also add in local4.none where it seems to be missing.
| -rw-r--r-- | etc/inc/system.inc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 9d3c30c..ba47740 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -711,7 +711,7 @@ function system_syslogd_get_remote_servers($syslogcfg, $facility = "*.*") { // Rather than repeatedly use the same code, use this function to build a list of remote servers. $facility .= " ". $remote_servers = ""; - $pad_to = 56; + $pad_to = max(strlen($facility), 56); $padding = ceil(($pad_to - strlen($facility))/8)+1; if($syslogcfg['remoteserver']) $remote_servers .= "{$facility}" . str_repeat("\t", $padding) . "@" . system_syslogd_fixup_server($syslogcfg['remoteserver']) . "\n"; @@ -844,11 +844,7 @@ function system_syslogd_start() { local3.* {$log_directive}{$g['varlog_path']}/vpn.log local4.* {$log_directive}{$g['varlog_path']}/portalauth.log local7.* {$log_directive}{$g['varlog_path']}/dhcpd.log -*.notice;kern.debug;lpr.info;mail.crit;daemon.none; {$log_directive}{$g['varlog_path']}/system.log -news.err;local0.none;local3.none;local4.none; {$log_directive}{$g['varlog_path']}/system.log -local7.none {$log_directive}{$g['varlog_path']}/system.log -security.* {$log_directive}{$g['varlog_path']}/system.log -auth.info;authpriv.info;daemon.info {$log_directive}{$g['varlog_path']}/system.log +*.notice;kern.debug;lpr.info;mail.crit;daemon.none;news.err;local0.none;local3.none;local4.none;local7.none;security.*;auth.info;authpriv.info;daemon.info {$log_directive}{$g['varlog_path']}/system.log auth.info;authpriv.info |exec /usr/local/sbin/sshlockout_pf 15 *.emerg * @@ -860,11 +856,7 @@ EOD; if (isset($syslogcfg['dhcp'])) $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "local7.*"); if (isset($syslogcfg['system'])) { - $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.notice;kern.debug;lpr.info;mail.crit;"); - $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "news.err;local0.none;local3.none;local7.none"); - $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "security.*"); - $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "auth.info;authpriv.info;daemon.info"); - $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.emerg"); + $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.emerg;*.notice;kern.debug;lpr.info;mail.crit;news.err;local0.none;local3.none;local7.none;security.*;auth.info;authpriv.info;daemon.info"); } if (isset($syslogcfg['logall'])) { // Make everything mean everything, including facilities excluded above. |
