Skip to content
Snippets Groups Projects
Commit e9279dcf authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !17
parents 84c48cba 0a0d3e04
No related branches found
No related tags found
1 merge request!17Merging develop into main
Pipeline #523116 passed
......@@ -551,6 +551,7 @@ class Handler extends BaseHandler {
foreach ($tasks as $name => $task) {
$disabled = !empty($task['disabled']);
$command = $task['command'];
$schedule = $task['schedule'];
$ping_url = FALSE;
$task['name'] = $name;
if (isset($hj_manager)) {
......@@ -558,6 +559,10 @@ class Handler extends BaseHandler {
$task['channels'] = $hj_api_channels;
$task['tags'] = implode(' ', ['d4d', $hj_project, $hj_branch]);
$task['tz'] = $hj_timezone;
if (count(explode(' ', $task['schedule'])) === 6) {
// Schedule contains seconds, they need to be removed.
$task['schedule'] = substr($task['schedule'], strpos($task['schedule'], ' ') + 1);
}
$check = NULL;
foreach ($hj_checks as $existing) {
......@@ -606,13 +611,13 @@ class Handler extends BaseHandler {
}
}
if (!$disabled) {
if (count(explode(' ', $task['schedule'])) === 5) {
if (count(explode(' ', $schedule)) === 5) {
// Add leading "0" for seconds.
$task['schedule'] = '0 ' . $task['schedule'];
$schedule = '0 ' . $schedule;
}
$activeTasks[] = [
'name' => $task['name'],
'schedule' => $task['schedule'],
'schedule' => $schedule,
'command' => $command,
'ping_url' => $ping_url,
'user' => $user,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment