summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-08-17 11:14:12 +0200
committerGitHub <noreply@github.com>2017-08-17 11:14:12 +0200
commite37cf2d6f0d32a07ccb6b61cb522725820879eee (patch)
treeca8aa918e078ae91de2d4a0a50d0ab5e59f910eb /settings
parenta53aa40b4ddf4c9f868ad03df7131ceee417f2c9 (diff)
parent1c38a83927ba318b1ef5115c0fe2fda0cdb5e454 (diff)
downloadnextcloud-server-e37cf2d6f0d32a07ccb6b61cb522725820879eee.tar.gz
nextcloud-server-e37cf2d6f0d32a07ccb6b61cb522725820879eee.zip
Merge pull request #6158 from nextcloud/always-log-cron-execution
Always log cron execution
Diffstat (limited to 'settings')
-rw-r--r--settings/templates/settings/admin/server.php40
1 files changed, 19 insertions, 21 deletions
diff --git a/settings/templates/settings/admin/server.php b/settings/templates/settings/admin/server.php
index 407badcff41..ab30f8e7700 100644
--- a/settings/templates/settings/admin/server.php
+++ b/settings/templates/settings/admin/server.php
@@ -156,28 +156,26 @@
<div class="section" id="backgroundjobs">
<h2 class="inlineblock"><?php p($l->t('Background jobs'));?></h2>
- <?php if ($_['cron_log']): ?>
- <p class="cronlog inlineblock">
- <?php if ($_['lastcron'] !== false):
- $relative_time = relative_modified_date($_['lastcron']);
- $absolute_time = OC_Util::formatDate($_['lastcron']);
- if (time() - $_['lastcron'] <= 3600): ?>
- <span class="status success"></span>
- <span class="crondate" title="<?php p($absolute_time);?>">
- <?php p($l->t("Last job ran %s.", [$relative_time]));?>
- </span>
- <?php else: ?>
- <span class="status error"></span>
- <span class="crondate" title="<?php p($absolute_time);?>">
- <?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
- </span>
- <?php endif;
- else: ?>
+ <p class="cronlog inlineblock">
+ <?php if ($_['lastcron'] !== false):
+ $relative_time = relative_modified_date($_['lastcron']);
+ $absolute_time = OC_Util::formatDate($_['lastcron']);
+ if (time() - $_['lastcron'] <= 3600): ?>
+ <span class="status success"></span>
+ <span class="crondate" title="<?php p($absolute_time);?>">
+ <?php p($l->t("Last job ran %s.", [$relative_time]));?>
+ </span>
+ <?php else: ?>
<span class="status error"></span>
- <?php p($l->t("Background job didn’t run yet!"));
- endif; ?>
- </p>
- <?php endif; ?>
+ <span class="crondate" title="<?php p($absolute_time);?>">
+ <?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
+ </span>
+ <?php endif;
+ else: ?>
+ <span class="status error"></span>
+ <?php p($l->t("Background job didn’t run yet!"));
+ endif; ?>
+ </p>
<a target="_blank" rel="noreferrer" class="icon-info"
title="<?php p($l->t('Open documentation'));?>"
href="<?php p(link_to_docs('admin-background-jobs')); ?>"></a>