diff options
author | Scott Ullrich <sullrich@sullrich-MacBookPro.local> | 2009-03-18 19:46:24 -0400 |
---|---|---|
committer | Scott Ullrich <sullrich@sullrich-MacBookPro.local> | 2009-03-18 19:46:24 -0400 |
commit | 783cdcaaa733a4415eeaea21309b0437602b3929 (patch) | |
tree | 228fc62f36d17da41d7ffedd9c5b2661734fe4e0 /usr/local | |
parent | 3d5b2e45e7a3d0ad6ae7dc59345283e626f675d2 (diff) | |
download | pfsense-783cdcaaa733a4415eeaea21309b0437602b3929.zip pfsense-783cdcaaa733a4415eeaea21309b0437602b3929.tar.gz |
* Rm log file before fifolog_create if it exists
* Do not hard code path to logs
Diffstat (limited to 'usr/local')
-rwxr-xr-x | usr/local/www/diag_logs.php | 3 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_auth.php | 4 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_dhcp.php | 4 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_filter.php | 4 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_filter_dynamic.php | 5 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_ipsec.php | 3 | ||||
-rw-r--r-- | usr/local/www/diag_logs_ntpd.php | 3 | ||||
-rw-r--r-- | usr/local/www/diag_logs_openvpn.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_relayd.php | 3 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_settings.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_slbd.php | 3 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_vpn.php | 5 |
12 files changed, 28 insertions, 12 deletions
diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index 5c1809a..d76bf44 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -38,7 +38,6 @@ ##|*MATCH=diag_logs.php* ##|-PRIV - require("guiconfig.inc"); $system_logfile = "{$g['varlog_path']}/system.log"; @@ -55,6 +54,8 @@ if ($_POST['clear']) { system_syslogd_start(); } else { exec("killall syslogd"); + if(file_exists("{$system_logfile}")) + unlink_file("{$system_logfile}"); exec("/usr/sbin/fifolog_create -s 511488 {$system_logfile}"); system_syslogd_start(); } diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index 775419a..2c48e42 100755 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -36,7 +36,6 @@ ##|*MATCH=diag_logs_auth.php* ##|-PRIV - require("guiconfig.inc"); $portal_logfile = "{$g['varlog_path']}/portalauth.log"; @@ -50,6 +49,9 @@ if ($_POST['clear']) { unlink($portal_logfile); touch($portal_logfile); } else { + exec("killall syslogd"); + if(file_exists("{$portal_logfile}")) + unlink_file("{$portal_logfile}"); exec("/usr/sbin/fifolog_create -s 511488 {$portal_logfile}"); } } diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index 4a232f8..35989ba 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -38,7 +38,6 @@ ##|*MATCH=diag_logs_dhcp.php* ##|-PRIV - require("guiconfig.inc"); $dhcpd_logfile = "{$g['varlog_path']}/dhcpd.log"; @@ -52,6 +51,9 @@ if ($_POST['clear']) { unlink($dhcpd_logfile); touch($dhcpd_logfile); } else { + exec("killall syslogd"); + if(file_exists("{$dhcpd_logfile}")) + unlink_file("{$dhcpd_logfile}"); exec("/usr/sbin/fifolog_create -s 511488 {$dhcpd_logfile}"); } } diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index a7fafd2..7a605ad 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -61,7 +61,9 @@ if ($_POST['clear']) { touch("/var/log/filter.log"); } else { exec("killall syslogd"); - exec("/usr/sbin/fifolog_create -s 511488 /var/log/filter.log"); + if(file_exists("{$filter_logfile}") + unlink_file("{$filter_logfile}"); + exec("/usr/sbin/fifolog_create -s 511488 {$filter_logfile}"); system_syslogd_start(); } } diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index 5b161d4..9c16124 100755 --- a/usr/local/www/diag_logs_filter_dynamic.php +++ b/usr/local/www/diag_logs_filter_dynamic.php @@ -37,7 +37,6 @@ ##|*MATCH=diag_logs_filter_dynamic.php* ##|-PRIV - require("guiconfig.inc"); $filter_logfile = "{$g['varlog_path']}/filter.log"; @@ -54,7 +53,9 @@ if ($_POST['clear']) { touch("/var/log/filter.log"); } else { exec("killall syslogd"); - exec("/usr/sbin/fifolog_create -s 511488 /var/log/filter.log"); + if(file_exists("{$filter_logfile}") + unlink_file("{$filter_logfile}"); + exec("/usr/sbin/fifolog_create -s 511488 {$filter_logfile}"); system_syslogd_start(); } } diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index dbc00e0..632ca65 100755 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -38,7 +38,6 @@ ##|*MATCH=diag_logs_ipsec.php* ##|-PRIV - require("guiconfig.inc"); $ipsec_logfile = "{$g['varlog_path']}/ipsec.log"; @@ -69,6 +68,8 @@ if ($_POST['clear']) { touch($ipsec_logfile); } else { exec("killall syslogd"); + if(file_exists("{$ipsec_logfile}") + unlink_file("{$ipsec_logfile}"); exec("/usr/sbin/fifolog_create -s 511488 {$ipsec_logfile}"); system_syslogd_start(); } diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php index 39cf400..68a72bd 100644 --- a/usr/local/www/diag_logs_ntpd.php +++ b/usr/local/www/diag_logs_ntpd.php @@ -36,7 +36,6 @@ ##|*MATCH=diag_logs_ntpd.php* ##|-PRIV - require("guiconfig.inc"); $ntpd_logfile = "{$g['varlog_path']}/ntpd.log"; @@ -51,6 +50,8 @@ if ($_POST['clear']) { touch($ntpd_logfile); } else { exec("killall syslogd"); + if(file_exists("{$ntpd_logfile}")) + unlink_file("{$ntpd_logfile}"); exec("/usr/sbin/fifolog_create -s 511488 {$ntpd_logfile}"); system_syslogd_start(); } diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php index b034e87..9a00822 100644 --- a/usr/local/www/diag_logs_openvpn.php +++ b/usr/local/www/diag_logs_openvpn.php @@ -55,6 +55,8 @@ if ($_POST['clear']) { touch($openvpn_logfile); } else { exec("killall syslogd"); + if(file_exists("{$openvpn_logfile}")) + unlink_file("{$openvpn_logfile}"); exec("/usr/sbin/fifolog_create -s 262144 {$openvpn_logfile}"); system_syslogd_start(); } diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php index 4c0de94..f00e493 100755 --- a/usr/local/www/diag_logs_relayd.php +++ b/usr/local/www/diag_logs_relayd.php @@ -37,7 +37,6 @@ ##|*MATCH=diag_logs_relayd.php* ##|-PRIV - require("guiconfig.inc"); $relayd_logfile = "{$g['varlog_path']}/relayd.log"; @@ -52,6 +51,8 @@ if ($_POST['clear']) { touch($relayd_logfile); } else { exec("killall syslogd"); + if(file_exists("{$relayd_logfile}")) + unlink_file("{$relayd_logfile}"); exec("/usr/sbin/fifolog_create -s 511488 {$relayd_logfile}"); system_syslogd_start(); } diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 4b7bdd4..83a5d80 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -38,7 +38,6 @@ ##|*MATCH=diag_logs_settings.php* ##|-PRIV - require("guiconfig.inc"); $pconfig['reverse'] = isset($config['syslog']['reverse']); diff --git a/usr/local/www/diag_logs_slbd.php b/usr/local/www/diag_logs_slbd.php index 5ba55f6..42449bc 100755 --- a/usr/local/www/diag_logs_slbd.php +++ b/usr/local/www/diag_logs_slbd.php @@ -37,7 +37,6 @@ ##|*MATCH=diag_logs_slbd.php* ##|-PRIV - require("guiconfig.inc"); $slbd_logfile = "{$g['varlog_path']}/slbd.log"; @@ -52,6 +51,8 @@ if ($_POST['clear']) { touch($slbd_logfile); } else { exec("killall syslogd"); + if(file_exists("{$slbd_logfile}")) + unlink_file("{$slbd_logfile}"); exec("/usr/sbin/fifolog_create -s 511488 {$slbd_logfile}"); system_syslogd_start(); } diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index 5ece014..cd5dcc6 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -48,7 +48,10 @@ if ($_POST['clear']) { if(isset($config['system']['disablesyslogclog'])) { unlink("/var/log/vpn.log"); touch("/var/log/vpn.log"); - } else { + } else { + exec("killall syslogd"); + if(file_exists("/var/log/vpn.log")) + unlink_file("/var/log/vpn.log"); exec("/usr/sbin/fifolog_create -s 50688 /var/log/vpn.log"); } /* redirect to avoid reposting form data on refresh */ |