diff options
| author | Ermal <eri@pfsense.org> | 2012-11-20 16:10:05 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2012-11-20 16:10:05 +0000 |
| commit | 344016a85ef63b0cde98a156723ad286bfabef19 (patch) | |
| tree | 1d074a41ae109ae0b210d459baf5e3c96deb2370 /etc | |
| parent | 6a45171d7f407e7b823d9fd7153bd75d44ef6a1d (diff) | |
| download | pfsense-344016a85ef63b0cde98a156723ad286bfabef19.zip pfsense-344016a85ef63b0cde98a156723ad286bfabef19.tar.gz | |
Cleanup a bit the syslog generation
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/system.inc | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 2146605..e846035 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -556,6 +556,7 @@ function system_syslogd_start() { if (isset($syslogcfg)) { $separatelogfacilities = array('ntp','ntpd','ntpdate','racoon','openvpn','pptps','poes','l2tps','relayd','hostapd','dnsmasq','unbound','dhcpd','dhcrelay','apinger','radvd','routed','olsrd','zebra','ospfd','bgpd'); + $syslogconf = ""; if($config['installedpackages']['package']) { foreach($config['installedpackages']['package'] as $package) { if($package['logging']) { @@ -566,12 +567,6 @@ function system_syslogd_start() { } } $facilitylist = implode(',', array_unique($separatelogfacilities)); - /* write syslog.conf */ - $fd = fopen("{$g['varetc_path']}/syslog.conf", "w"); - if (!$fd) { - printf(gettext("Error: cannot open syslog.conf in system_syslogd_start().%s"), "\n"); - return 1; - } $syslogconf .= "!radvd,routed,olsrd,zebra,ospfd,bgpd\n"; if (!isset($syslogcfg['disablelocallogging'])) $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/routing.log\n"; @@ -681,22 +676,22 @@ EOD; EOD; } - fwrite($fd, $syslogconf); - fclose($fd); + /* write syslog.conf */ + if (!@file_put_contents("{$g['varetc_path']}/syslog.conf", $syslogconf)) { + printf(gettext("Error: cannot open syslog.conf in system_syslogd_start().%s"), "\n"); + unset($syslogconf); + return 1; + } + unset($syslogconf); // Ensure that the log directory exists - if(!is_dir("{$g['dhcpd_chroot_path']}/var/run")) + if (!is_dir("{$g['dhcpd_chroot_path']}/var/run")) exec("/bin/mkdir -p {$g['dhcpd_chroot_path']}/var/run"); - // Are we logging to a least one remote server ? - if(strpos($syslogconf, "@") != false) - $retval = mwexec_bg("/usr/sbin/syslogd -c -c -l /var/dhcpd/var/run/log -f {$g['varetc_path']}/syslog.conf"); - else { - $retval = mwexec_bg("/usr/sbin/syslogd -c -c -l /var/dhcpd/var/run/log -f {$g['varetc_path']}/syslog.conf"); - } + $retval = mwexec_bg("/usr/sbin/syslogd -c -c -l {$g['dhcpd_chroot_path']}/var/run/log -f {$g['varetc_path']}/syslog.conf"); } else { - $retval = mwexec_bg("/usr/sbin/syslogd -c -c -l /var/dhcpd/var/run/log"); + $retval = mwexec_bg("/usr/sbin/syslogd -c -c -l {$g['dhcpd_chroot_path']}/var/run/log"); } if ($g['booting']) |
