Skip to content

[stable24] Only show cron warning after 24h due to time insensitive jobs #35018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 1 commit into from
Nov 23, 2022
Merged

[stable24] Only show cron warning after 24h due to time insensitive jobs #35018

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions apps/settings/templates/settings/admin/server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,17 @@
<span class="crondate" title="<?php p($absolute_time);?>">
<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
</span>
<?php } elseif (time() - $_['cronMaxAge'] > 12 * 3600) {
if ($_['backgroundjobs_mode'] === 'cron') { ?>
<?php } elseif ($_['backgroundjobs_mode'] === 'cron' && time() - $_['cronMaxAge'] > 24 * 3600) { ?>
<span class="status warning"></span>
<span class="crondate" title="<?php p($maxAgeAbsoluteTime);?>">
<?php p($l->t("Some jobs haven’t been executed since %s. Please consider increasing the execution frequency.", [$maxAgeRelativeTime]));?>
</span>
<?php } else { ?>
<?php } elseif ($_['backgroundjobs_mode'] !== 'cron' && time() - $_['cronMaxAge'] > 12 * 3600) { ?>
<span class="status error"></span>
<span class="crondate" title="<?php p($maxAgeAbsoluteTime);?>">
<?php p($l->t("Some jobs didn’t execute since %s. Please consider switching to system cron.", [$maxAgeRelativeTime]));?>
</span>
<?php }
} else { ?>
<?php } else { ?>
<span class="status success"></span>
<span class="crondate" title="<?php p($absolute_time);?>">
<?php p($l->t("Last job ran %s.", [$relative_time]));?>
Expand Down