fixup! fixup! fixup! fixup! manager: files: watchdog: added RPZ files

Author: alesmrazek

python/knot_resolver/manager/files/watchdog.py

@@ -87,6 +87,12 @@ def on_deleted(self, event: FileSystemEvent) -> None:
                     if cmd in self._timers:
                         self._timers[cmd].cancel()
 
+        def on_moved(self, event: FileSystemEvent) -> None:
+            src_path = Path(str(event.src_path))
+            if src_path in self._files.keys():
+                logger.info(f"Watched file '{src_path}' has been moved")
+                self._trigger(self._files[src_path])
+
         def on_modified(self, event: FileSystemEvent) -> None:
             src_path = Path(str(event.src_path))
             if src_path in self._files.keys():

tests/packaging/interactive/rpz_watchdog.sh

@@ -90,7 +90,7 @@ echo "48.zz.101.db8.2001.rpz-client-ip  CNAME rpz-passthru." >> $rpz_file.new
 mv -f $rpz_file.new $rpz_file
 
 # wait for files reload to finish
-sleep 10
+sleep 6
 
 if [ $(count_errors) -ne $err_count ] || [ $(count_reloads) -eq $rel_count ]; then
     echo "Could not reload replaced RPZ file."