webcron
/
webcron
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases 6 Wiki Activity

BUGFIX: demo mode was always activated

This commit is contained in:
Jeroen De Meerleer 2022-07-02 11:33:42 +02:00
parent 417521d497
commit b3e25ac14b
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Repository/JobRepository.php
View File

@ -187,7 +187,7 @@ class JobRepository extends EntityRepository
*/ */
private function runHttpJob(Job &$job): array private function runHttpJob(Job &$job): array
{ {
if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE']) { if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE'] == 'true') {
$exitcodes = [...array_fill(0,120, $job->getData('http-status')[0]), ...array_keys(Response::$statusTexts)]; $exitcodes = [...array_fill(0,120, $job->getData('http-status')[0]), ...array_keys(Response::$statusTexts)];
$return['exitcode'] = $exitcodes[random_int(0, 181)]; $return['exitcode'] = $exitcodes[random_int(0, 181)];
$return['failed'] = !in_array($return['exitcode'], $job->getData('http-status')); $return['failed'] = !in_array($return['exitcode'], $job->getData('http-status'));
@ -228,8 +228,8 @@ class JobRepository extends EntityRepository
*/ */
private function runCommandJob(Job &$job): array private function runCommandJob(Job &$job): array
{ {
if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE']) { if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE'] == 'true') {
$exitcodes = [...array_fill(0,400, $job->getData('response')), ...range(0, 255)]; $exitcodes = [...array_fill(0,400, $job->getData('response')[0]), ...range(0, 255)];
$return['exitcode'] = $exitcodes[random_int(0, 655)]; $return['exitcode'] = $exitcodes[random_int(0, 655)];
$return['failed'] = !in_array($return['exitcode'], $job->getData('response')); $return['failed'] = !in_array($return['exitcode'], $job->getData('response'));
$return['output'] = 'Demo mode!'; $return['output'] = 'Demo mode!';
@ -321,7 +321,7 @@ class JobRepository extends EntityRepository
{ {
$em = $this->getEntityManager(); $em = $this->getEntityManager();
if($job->getRunning() == 1) { if($job->getRunning() == 1) {
if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE']) { if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE'] == 'true') {
$job->setRunning(time() + $job->getData('reboot-delay-secs') + ($job->getData('reboot-duration') * 60)); $job->setRunning(time() + $job->getData('reboot-delay-secs') + ($job->getData('reboot-duration') * 60));
$em->persist($job); $em->persist($job);
$em->flush(); $em->flush();
@ -362,8 +362,8 @@ class JobRepository extends EntityRepository
if($job->getRunning() > time()) { if($job->getRunning() > time()) {
return ['status' => 'deferred']; return ['status' => 'deferred'];
} }
if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE']) { if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE'] == 'true') {
$exitcodes = [...array_fill(0,400, $job->getData('getservices-response')), ...range(0, 255)]; $exitcodes = [...array_fill(0,400, $job->getData('getservices-response')[0]), ...range(0, 255)];
$return['exitcode'] = $exitcodes[random_int(0, 655)]; $return['exitcode'] = $exitcodes[random_int(0, 655)];
$return['failed'] = !in_array($return['exitcode'], $job->getData('getservices-response')); $return['failed'] = !in_array($return['exitcode'], $job->getData('getservices-response'));
$return['output'] = 'Demo mode!'; $return['output'] = 'Demo mode!';
@ -717,4 +717,4 @@ class JobRepository extends EntityRepository
return ['success' => true, 'message' => 'Cronjob succesfully deleted']; return ['success' => true, 'message' => 'Cronjob succesfully deleted'];
} }
} }

4
templates/flashes.html.twig
View File

@ -7,10 +7,10 @@
</div> </div>
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% if app.request.server.get('DEMO_MODE') %} {% if app.request.server.get('DEMO_MODE') == 'true' %}
<div class="alert alert-warning alert-dismissible fade show" role="alert"> <div class="alert alert-warning alert-dismissible fade show" role="alert">
{{ 'demomode.flashnotice' | trans }} {{ 'demomode.flashnotice' | trans }}
<button type="button" class="btn-close" data-dismiss="alert" aria-label="Close"> <button type="button" class="btn-close" data-dismiss="alert" aria-label="Close">
</button> </button>
</div> </div>
{% endif %} {% endif %}