BlockedZoneManager: added retry mechanism for delayed save.

besmirzanaj · Jun 1, 2024 · f050deb · f050deb
1 parent 2a05c7a
commit f050deb
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/DnsServerCore/Dns/ZoneManagers/BlockedZoneManager.cs b/DnsServerCore/Dns/ZoneManagers/BlockedZoneManager.cs
@@ -61,17 +61,20 @@ public BlockedZoneManager(DnsServer dnsServer)
             {
                 lock (_saveLock)
                 {
-                    try
-                    {
-                        SaveZoneFileInternal();
-                    }
-                    catch (Exception ex)
-                    {
-                        _dnsServer.LogManager.Write(ex);
-                    }
-                    finally
+                    if (_pendingSave)
                     {
-                        _pendingSave = false;
+                        try
+                        {
+                            SaveZoneFileInternal();
+                            _pendingSave = false;
+                        }
+                        catch (Exception ex)
+                        {
+                            _dnsServer.LogManager.Write(ex);
+
+                            //set timer to retry again
+                            _saveTimer.Change(SAVE_TIMER_INITIAL_INTERVAL, Timeout.Infinite);
+                        }
                     }
                 }
             });
@@ -88,10 +91,10 @@ public void Dispose()
             if (_disposed)
                 return;
 
-            _saveTimer?.Dispose();
-
             lock (_saveLock)
             {
+                _saveTimer?.Dispose();
+
                 if (_pendingSave)
                 {
                     try