remove request on delay

yegor256 · Jul 21, 2024 · 2aecd51 · 2aecd51
1 parent f132691
commit 2aecd51
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/com/rultor/agents/daemons/KillsDaemon.java b/src/main/java/com/rultor/agents/daemons/KillsDaemon.java
@@ -78,16 +78,16 @@ public Iterable<Directive> process(final XML xml) throws IOException {
         final String name = xml.xpath("/talk/@name").get(0);
         try {
             Logger.info(
-                this, "Daemon of %s killed due to delay, code=%d",
+                this, "The daemon of %s has been killed due to delay, code=%d",
                 name, new Script("kill.sh").exec(xml)
             );
         } catch (final IllegalArgumentException ex) {
             Logger.warn(
-                this, "Failed to kill the daemon of %s due to delay: %s",
+                this, "We failed to kill the daemon of %s due to delay: %s",
                 name, ex.getMessage()
             );
         }
-        return new Directives();
+        return new Directives().xpath("/talk/request").remove();
     }
 
 }
diff --git a/src/main/java/com/rultor/agents/daemons/SanitizesDaemon.java b/src/main/java/com/rultor/agents/daemons/SanitizesDaemon.java
@@ -70,7 +70,7 @@ public Iterable<Directive> process(final XML xml) throws IOException {
         if (exit != 0) {
             dirs.xpath("/talk/daemon/dir").remove();
             Logger.warn(
-                this, "daemon of %s lost its directory: %s",
+                this, "The daemon of %s has lost its directory: %s",
                 xml.xpath("/talk/@name").get(0),
                 dir
             );

diff --git a/src/main/java/com/rultor/agents/daemons/WipesDaemon.java b/src/main/java/com/rultor/agents/daemons/WipesDaemon.java
@@ -58,7 +58,9 @@ public WipesDaemon() {
     @Override
     public Iterable<Directive> process(final XML xml) {
         Logger.warn(this, "daemon wiped: %s", xml.xpath("/talk/@name").get(0));
-        return new Directives().xpath("/talk/daemon").remove();
+        return new Directives()
+            .xpath("/talk/daemon")
+            .remove();
     }
 
 }