Commit 517c2cc9 authored by Franco Fichtner's avatar Franco Fichtner

firewall: wait for filterdns to exit to avoid races

The restart was moved just below the stop now, which could cause
potential issues.  Need to be careful now...
parent a203c699
...@@ -589,12 +589,12 @@ function filter_configure_sync($verbose = false) ...@@ -589,12 +589,12 @@ function filter_configure_sync($verbose = false)
} }
} }
} }
killbypid('/var/run/filterdns.pid'); killbypid('/var/run/filterdns.pid', 'TERM', true);
if (!empty($filterdns)) { if (!empty($filterdns)) {
@file_put_contents('/var/etc/filterdns.conf', $filterdns); @file_put_contents('/var/etc/filterdns.conf', $filterdns);
/* /*
* FilterDNS has three debugging levels. The default choosen is 1. * FilterDNS has three debugging levels. The default choosen is 1.
* Availabe are level 2 and greater then 2. * Availabe are level 2 and greater than 2.
*/ */
if (isset($config['system']['aliasesresolveinterval']) && is_numeric($config['system']['aliasesresolveinterval'])) { if (isset($config['system']['aliasesresolveinterval']) && is_numeric($config['system']['aliasesresolveinterval'])) {
$resolve_interval = $config['system']['aliasesresolveinterval']; $resolve_interval = $config['system']['aliasesresolveinterval'];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment