From 7ccf5e8c8bcc64a743e241ff9219c13a62d9765f Mon Sep 17 00:00:00 2001
From: Jeroen De Meerleer <me@jeroened.be>
Date: Wed, 14 Jul 2021 13:09:23 +0200
Subject: [PATCH] NEW FEATURE: reboot jobs can fail as well

---
 src/Repository/Job.php       | 9 ++++-----
 templates/job/add.html.twig  | 9 +++++++--
 templates/job/edit.html.twig | 9 +++++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/Repository/Job.php b/src/Repository/Job.php
index c7e3dd8..f2cf31e 100644
--- a/src/Repository/Job.php
+++ b/src/Repository/Job.php
@@ -134,13 +134,11 @@ class Job extends Repository
         }
         if($job['data']['hosttype'] == 'local') {
             $return = $this->runLocalCommand($command);
-            $return['failed'] = !in_array($return['exitcode'], $job['data']['response']);
-            return $return;
         } elseif($job['data']['hosttype'] == 'ssh') {
             $return = $this->runSshCommand($command, $job['data']['host'], $job['data']['user'], $job['data']['ssh-privkey'], $job['data']['privkey-password']);
-            $return['failed'] = !in_array($return['exitcode'], $job['data']['response']);
-            return $return;
         }
+        $return['failed'] = !in_array($return['exitcode'], $job['data']['response']);
+        return $return;
     }
 
     private function runLocalCommand(string $command): array
@@ -229,7 +227,7 @@ class Job extends Repository
             } elseif($job['data']['hosttype'] == 'local') {
                 $return = $this->runLocalCommand($job['data']['getservices-command']);
             }
-
+            $return['failed'] = !in_array($return['exitcode'], $job['data']['getservices-response']);
             return $return;
         }
     }
@@ -385,6 +383,7 @@ class Job extends Repository
             case 'reboot':
                 $values['data']['reboot-command'] = $values['reboot-command'];
                 $values['data']['getservices-command'] = $values['getservices-command'];
+                $values['data']['getservices-response'] = explode(',',$values['getservices-response']);
                 $values['data']['reboot-duration'] = $values['reboot-duration'];
                 if(!empty($values['reboot-delay'])) {
                     $newsecretkey = count($values['var-value']);
diff --git a/templates/job/add.html.twig b/templates/job/add.html.twig
index 6a2d486..821749f 100644
--- a/templates/job/add.html.twig
+++ b/templates/job/add.html.twig
@@ -95,13 +95,18 @@
         <h4>Reboot job details</h4>
         <div class="mb-3">
             <label for="reboot-command">Reboot command</label>
-            <input type="text" name="reboot-command" class="form-control" id="command" placeholder="systemctl reboot">
+            <input type="text" name="reboot-command" class="form-control" id="reboot-command" placeholder="systemctl reboot">
             <small id="reboot-command-help" class="form-text text-muted">Use {reboot-delay} or {reboot-delay-secs} to add the delay in your command</small>
         </div>
 
         <div class="mb-3">
             <label for="getservices-command">Get services command</label>
-            <input type="text" name="getservices-command" class="form-control" id="command" placeholder="systemctl list-units">
+            <input type="text" name="getservices-command" class="form-control" id="getservices-command" placeholder="systemctl list-units">
+        </div>
+
+        <div class="mb-3">
+            <label for="getservices-response">Get services command exit code</label>
+            <input type="text" name="getservices-response" class="form-control" id="getservices-response" placeholder="0">
         </div>
 
         <div class="mb-3">
diff --git a/templates/job/edit.html.twig b/templates/job/edit.html.twig
index e264903..a23b301 100644
--- a/templates/job/edit.html.twig
+++ b/templates/job/edit.html.twig
@@ -113,13 +113,18 @@
         <h4>Reboot job details</h4>
         <div class="mb-3">
             <label for="reboot-command">Reboot command</label>
-            <input type="text" name="reboot-command" class="form-control" id="command" placeholder="systemctl reboot" value="{% if attribute(data, 'reboot-command') is not empty %}{{ attribute(data, 'reboot-command') }}{% endif %}">
+            <input type="text" name="reboot-command" class="form-control" id="reboot-command" placeholder="systemctl reboot" value="{% if attribute(data, 'reboot-command') is not empty %}{{ attribute(data, 'reboot-command') }}{% endif %}">
             <small id="reboot-command-help" class="form-text text-muted">Use {reboot-delay} or {reboot-delay-secs} to add the delay in your command</small>
         </div>
 
         <div class="mb-3">
             <label for="getservices-command">Get services command</label>
-            <input type="text" name="getservices-command" class="form-control" id="command" placeholder="systemctl list-units" value="{% if attribute(data, 'getservices-command') is not empty %}{{ attribute(data, 'getservices-command') }}{% endif %}">
+            <input type="text" name="getservices-command" class="form-control" id="getservices)command" placeholder="systemctl list-units" value="{% if attribute(data, 'getservices-command') is not empty %}{{ attribute(data, 'getservices-command') }}{% endif %}">
+        </div>
+
+        <div class="mb-3">
+            <label for="getservices-response">Get services command exit code</label>
+            <input type="text" name="getservices-response" class="form-control" id="getservices-response" placeholder="0" value="{% if attribute(data, 'getservices-response') is not empty %}{{ attribute(data, 'getservices-response') | join(',') }}{% endif %}">
         </div>
 
         <div class="mb-3">