minicron is now used on a number of items in the gui. tell the cp prune process to use the pid name cp-prunedb.pid

This commit is contained in:
Scott Ullrich 2011-02-07 17:19:33 -05:00
parent aa69dbd256
commit e8aef0eccc

View File

@ -226,7 +226,7 @@ function captiveportal_configure() {
touch("{$g['vardb_path']}/captiveportal.db");
/* kill any running minicron */
killbypid("{$g['varrun_path']}/minicron.pid");
killbypid("{$g['varrun_path']}/cp_prunedb.pid");
/* init ipfw rules */
captiveportal_init_rules(true);
@ -418,11 +418,11 @@ EOD;
captiveportal_init_webgui();
/* Kill any existing prunecaptiveportal processes */
if(file_exists("{$g['varrun_path']}/minicron.pid"))
killbypid("{$g['varrun_path']}/minicron.pid");
if(file_exists("{$g['varrun_path']}/cp_prunedb.pid"))
killbypid("{$g['varrun_path']}/cp_prunedb.pid");
/* start pruning process (interval defaults to 60 seconds) */
mwexec("/usr/local/bin/minicron $croninterval {$g['varrun_path']}/minicron.pid " .
mwexec("/usr/local/bin/minicron $croninterval {$g['varrun_path']}/cp_prunedb.pid " .
"/etc/rc.prunecaptiveportal");
/* generate radius server database */
@ -433,7 +433,7 @@ EOD;
} else {
killbypid("{$g['varrun_path']}/lighty-CaptivePortal.pid");
killbypid("{$g['varrun_path']}/minicron.pid");
killbypid("{$g['varrun_path']}/cp_prunedb.pid");
captiveportal_radius_stop_all();