diff options
| author | jim-p <jimp@pfsense.org> | 2011-09-30 20:20:14 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-09-30 20:20:14 -0400 |
| commit | 8de525255b925bc8f9b62aacd42e76a16e5712b9 (patch) | |
| tree | a88b77f91d61f3b1c88f33fe845d1d1d92ba1faf | |
| parent | 48183867284a237cae21ef0dbf34cd52db10ad4a (diff) | |
| download | pfsense-8de525255b925bc8f9b62aacd42e76a16e5712b9.zip pfsense-8de525255b925bc8f9b62aacd42e76a16e5712b9.tar.gz | |
Change the way syslogd is killed/restarted a bit. Fixes log related pages hanging when logs are reset (or saving syslog settings)
| -rw-r--r-- | etc/inc/system.inc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 93dfd29..4a36b14 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -430,9 +430,9 @@ function system_syslogd_start() { killbypid("{$g['varrun_path']}/syslog.pid"); if(is_process_running("syslogd")) - mwexec("/usr/bin/killall -9 syslogd"); + pkill("syslogd"); if(is_process_running("fifolog_writer")) - mwexec("/usr/bin/killall -9 fifolog_writer"); + pkill("fifolog_writer"); // Define carious commands for logging $fifolog_create = "/usr/sbin/fifolog_create -s "; @@ -633,12 +633,13 @@ EOD; // Are we logging to a least one remote server ? if(strpos($syslogconf, "@") != false) - $retval = system("/usr/sbin/syslogd -c -c -l /var/dhcpd/var/run/log -f {$g['varetc_path']}/syslog.conf"); - else - $retval = system("/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 /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"); + } } else { - $retval = mwexec("/usr/sbin/syslogd -c -c -l /var/dhcpd/var/run/log"); + $retval = mwexec_bg("/usr/sbin/syslogd -c -c -l /var/dhcpd/var/run/log"); } if ($g['booting']) |
