Merge: - /filtering/remove_url: windows: remove filter file only after DNS server has been stopped

Close #878

* commit '375e410aa310c24ec0e95ee48ebd40675d5df1e7':
  - /filtering/remove_url: windows: remove filter file only after DNS server has been stopped

home/control.go

@@ -722,6 +722,11 @@ func handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// Stop DNS server:
+	//  we close urlfilter object which in turn closes file descriptors to filter files.
+	// Otherwise, Windows won't allow us to remove the file which is being currently used.
+	_ = dnsServer.Stop()
+
 	// go through each element and delete if url matches
 	config.Lock()
 	newFilters := config.Filters[:0]
@@ -732,9 +737,11 @@ func handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) {
 			// Remove the filter file
 			err := os.Remove(filter.Path())
 			if err != nil && !os.IsNotExist(err) {
+				config.Unlock()
 				httpError(w, http.StatusInternalServerError, "Couldn't remove the filter file: %s", err)
 				return
 			}
+			log.Debug("os.Remove(%s)", filter.Path())
 		}
 	}
 	// Update the configuration after removing filter files

home/dns.go

@@ -257,7 +257,7 @@ func startDNSServer() error {
 
 func reconfigureDNSServer() error {
 	if !isRunning() {
-		return fmt.Errorf("Refusing to reconfigure forwarding DNS server: not running")
+		return nil
 	}
 
 	config, err := generateServerConfig()
@@ -274,7 +274,7 @@ func reconfigureDNSServer() error {
 
 func stopDNSServer() error {
 	if !isRunning() {
-		return fmt.Errorf("Refusing to stop forwarding DNS server: not running")
+		return nil
 	}
 
 	err := dnsServer.Stop()