From 9cd47c79b11b2edc0616187f569bf080553876f4 Mon Sep 17 00:00:00 2001 From: Shreyas Zare Date: Sat, 11 Mar 2023 15:21:31 +0530 Subject: [PATCH] WebServiceSettingsApi: updated SetDnsSettings() to fix issue causing double block list update trigger. Other minor code refactoring changes done. --- DnsServerCore/WebServiceSettingsApi.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/DnsServerCore/WebServiceSettingsApi.cs b/DnsServerCore/WebServiceSettingsApi.cs index cebbc06c..4bade4be 100644 --- a/DnsServerCore/WebServiceSettingsApi.cs +++ b/DnsServerCore/WebServiceSettingsApi.cs @@ -169,8 +169,7 @@ namespace DnsServerCore } catch (Exception ex) { - _dnsWebService._log.Write("Failed to restart DNS service."); - _dnsWebService._log.Write(ex); + _dnsWebService._log.Write("Failed to restart DNS service.\r\n" + ex.ToString()); } }); } @@ -192,8 +191,7 @@ namespace DnsServerCore } catch (Exception ex) { - _dnsWebService._log.Write("Failed to restart web service."); - _dnsWebService._log.Write(ex); + _dnsWebService._log.Write("Failed to restart web service.\r\n" + ex.ToString()); } }); } @@ -1188,10 +1186,10 @@ namespace DnsServerCore //blocklist timers if ((_blockListUpdateIntervalHours > 0) && ((_dnsWebService.DnsServer.BlockListZoneManager.AllowListUrls.Count + _dnsWebService.DnsServer.BlockListZoneManager.BlockListUrls.Count) > 0)) { - if (blockListUrlsUpdated || (_blockListUpdateTimer is null)) + if (_blockListUpdateTimer is null) + StartBlockListUpdateTimer(); + else if (blockListUrlsUpdated) ForceUpdateBlockLists(); - - StartBlockListUpdateTimer(); } else {