summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-08-16 20:55:38 +0200
committerMorris Jobke <hey@morrisjobke.de>2017-08-17 09:45:11 +0200
commit1c38a83927ba318b1ef5115c0fe2fda0cdb5e454 (patch)
tree6d2ce15eb24ffb1debefe5236bb69ce01763a08c /settings
parentf0eb882c2e72e1c855ec3ddc0dfe87936babbd76 (diff)
downloadnextcloud-server-1c38a83927ba318b1ef5115c0fe2fda0cdb5e454.tar.gz
nextcloud-server-1c38a83927ba318b1ef5115c0fe2fda0cdb5e454.zip
Always log cron execution
There was a setting to disable the last execution of cron. There is no known problem with this write access and it was also questioned when this feature was build in https://github.com/owncloud/core/pull/7689#issuecomment-38264707 Recently there was also a bug report about a non-visible last cron execution (#6088) - let's better remove this. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
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>