diff --git a/src/Command/DaemonCommand.php b/src/Command/DaemonCommand.php
index 17f544b..7e46a4c 100644
--- a/src/Command/DaemonCommand.php
+++ b/src/Command/DaemonCommand.php
@@ -56,14 +56,19 @@ class DaemonCommand extends Command
$jobsToRun = $jobRepo->getJobsDue();
if(!empty($jobsToRun)) {
foreach($jobsToRun as $key=>$job) {
- if($job->getData('crontype') == 'reboot') {
- $str = @file_get_contents('/proc/uptime');
- $num = floatval($str);
+ if ($job->getData('crontype') == 'reboot') {
+ $str = @file_get_contents('/proc/uptime');
+ $num = floatval($str);
$rebootedself = ($num < $job->getData('reboot-duration') * 60);
$consolerun = $jobRepo->getTempVar($job, 'consolerun', false);
- if($consolerun && !$rebootedself) continue;
+ if ($consolerun && !$rebootedself) continue;
}
- $manual = ($job->getRunning() > 1);
+ $manual = '';
+ if($jobRepo->getTempVar($job, 'webhook', false)) {
+ $manual = 'Webhook';
+ } elseif($job->getRunning() > 1) {
+ $manual = 'Manual';
+ };
$jobRepo->setJobRunning($job, true);
$output->writeln('Running Job ' . $job->getId());
if($async) {
diff --git a/src/Command/DemoInstallCommand.php b/src/Command/DemoInstallCommand.php
index 8716262..18264e0 100755
--- a/src/Command/DemoInstallCommand.php
+++ b/src/Command/DemoInstallCommand.php
@@ -86,6 +86,7 @@ class DemoInstallCommand extends Command
false,
]
]);
+ $job1->addToken();
$job2 = $jobRepo->prepareJob([
'name' => '[Website] Update texts to latest version',
@@ -111,6 +112,8 @@ class DemoInstallCommand extends Command
true,
]
]);
+ $job2->addToken();
+
$job3 = $jobRepo->prepareJob([
'name' => '[Server][Reboot] Monthly reboot',
'interval' => (60*60*24*30),
@@ -136,6 +139,8 @@ class DemoInstallCommand extends Command
'var-issecret' => [
]
]);
+ $job3->addToken();
+
$em->persist($job1);
$em->persist($job2);
$em->persist($job3);
@@ -220,6 +225,15 @@ rtt min/avg/max/mdev = 101.362/101.362/101.362/0.000 ms')
->setFlags(RunRepository::SUCCESS);
$em->persist($run);
+ $run = new Run();
+ $run->setExitcode(200)
+ ->setJob($job2)
+ ->setRuntime(rand(0, 10000) / 1000)
+ ->setOutput(json_encode(['success' => true, 'message' => 'Texts are updated succesfully']))
+ ->setTimestamp(7200 * ceil( time() / 7200) - (3542))
+ ->setFlags(RunRepository::SUCCESS . RunRepository::TRIGGERED);
+ $em->persist($run);
+
$run = new Run();
$run->setExitcode(200)
->setJob($job2)
diff --git a/src/Controller/JobController.php b/src/Controller/JobController.php
index 09aef0d..a787c9a 100644
--- a/src/Controller/JobController.php
+++ b/src/Controller/JobController.php
@@ -117,6 +117,7 @@ class JobController extends AbstractController
$jobRepo = $doctrine->getRepository(Job::class);
$job = $jobRepo->find($id);
if(!empty($job->getToken()) && $job->getToken() == $token && $job->getRunning() != 1) {
+ $jobRepo->setTempVar($job, 'webhook', true);
return new JsonResponse($jobRepo->run($job, false, time()));
}
diff --git a/src/Repository/JobRepository.php b/src/Repository/JobRepository.php
index 9e5fe9b..1ec2d4f 100644
--- a/src/Repository/JobRepository.php
+++ b/src/Repository/JobRepository.php
@@ -317,7 +317,7 @@ class JobRepository extends EntityRepository
* @return array|string[]
* @throws \Doctrine\DBAL\Exception
*/
- private function runRebootJob(Job &$job, float &$starttime, bool &$manual): array
+ private function runRebootJob(Job &$job, float &$starttime, string &$manual): array
{
$em = $this->getEntityManager();
if($this->getTempVar($job, 'rebooting', false) === false) {
@@ -463,7 +463,7 @@ class JobRepository extends EntityRepository
* @return array|string[]
* @throws \Doctrine\DBAL\Exception
*/
- public function runJob(Job &$job, bool $manual): array
+ public function runJob(Job &$job, string $manual): array
{
$em = $this->getEntityManager();
$starttime = microtime(true);
@@ -486,8 +486,10 @@ class JobRepository extends EntityRepository
$flags[] = RunRepository::SUCCESS;
}
- if ($manual === true) {
+ if ($manual == 'Manual') {
$flags[] = RunRepository::MANUAL;
+ } elseif ($manual == 'Webhook') {
+ $flags[] = RunRepository::TRIGGERED;
}
// Remove secrets from output
diff --git a/src/Repository/RunRepository.php b/src/Repository/RunRepository.php
index 775e239..b4eb36e 100644
--- a/src/Repository/RunRepository.php
+++ b/src/Repository/RunRepository.php
@@ -14,6 +14,7 @@ class RunRepository extends EntityRepository
const FAILED = 'F';
const SUCCESS = 'S';
const MANUAL = 'M';
+ const TRIGGERED = 'T';
public function getRunsForJob(Job $job, bool $onlyfailed = false, int $maxage = NULL, bool $ordered = true): array
{
diff --git a/templates/job/view.html.twig b/templates/job/view.html.twig
index c2081f5..85072b0 100644
--- a/templates/job/view.html.twig
+++ b/templates/job/view.html.twig
@@ -19,6 +19,8 @@
({{ "job.view.results.exitcode"| trans }}: {{ run.exitcode }} | {{ "job.view.results.runtime"| trans }}: {{ run.runtime | interval }})
{% if 'M' in run.flags %}
{{ "job.view.results.manual"| trans }}
+ {% elseif 'T' in run.flags %}
+ {{ "job.view.results.webhook"| trans }}
{% endif %}
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index fab062d..cefa871 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -637,6 +637,10 @@
job.view.webhookurl
Webhook URL
+
+ job.view.results.webhook
+ Triggered run
+
diff --git a/translations/messages.leet.xlf b/translations/messages.leet.xlf
index 4dd9508..a5f32a4 100644
--- a/translations/messages.leet.xlf
+++ b/translations/messages.leet.xlf
@@ -7,635 +7,639 @@