Merge pull request #7689 from owncloud/last_cron_log

Log last cron execution

3 files changed, 40 insertions, 1 deletions

diff --git a/settings/admin.php b/settings/admin.php
index 80b038d2ef6..23b3a2d5a0e 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -45,6 +45,8 @@ $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
 $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
 $tmpl->assign('old_php', OC_Util::isPHPoutdated());
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
+$tmpl->assign('cron_log', OC_Config::getValue('cron_log', true));
+$tmpl->assign('lastcron', OC_Appconfig::getValue('core', 'lastcron', false));
 $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
 
 // Check if connected using HTTPS
diff --git a/settings/css/settings.css b/settings/css/settings.css
index a47e7bf6563..280d022af4e 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -167,6 +167,26 @@ table.shareAPI td { padding-bottom: 0.8em; }
 	width: 40px;
 }
 
+.cronlog {
+	margin-left: 10px;
+}
+
+.cronstatus {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	vertical-align: text-bottom;
+}
+
+span.success {
+        background: #37ce02;
+        border-radius: 8px;
+}
+
+span.error {
+        background: #ce3702;
+}
+
 /* HELP */
 .pressed {background-color:#DDD;}
 
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 6e816c1fff6..9092d2833fd 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -157,7 +157,24 @@ if (!$_['internetconnectionworking']) {
 ;?>
 
 <fieldset class="personalblock" id="backgroundjobs">
-	<h2><?php p($l->t('Cron'));?></h2>
+	<h2 class="inlineblock"><?php p($l->t('Cron'));?></h2>
+	<?php if ($_['cron_log']): ?>
+	<p class="cronlog inlineblock">
+		<?php if ($_['lastcron'] !== false):
+			$human_time = OC_Util::formatDate($_['lastcron']) . " UTC";
+			if (time() - $_['lastcron'] <= 3600): ?>
+				<span class="cronstatus success"></span>
+				<?php p($l->t("Last cron was executed at %s.", array($human_time)));
+			else: ?>
+				<span class="cronstatus error"></span>
+				<?php p($l->t("Last cron was executed at %s. This is more than an hour ago, something seems wrong.", array($human_time)));
+			endif;
+		else: ?>
+			<span class="cronstatus error"></span>
+			<?php p($l->t("Cron was not executed yet!"));
+		endif; ?>
+	</p>
+	<?php endif; ?>
 	<p>
 				<input type="radio" name="mode" value="ajax"
 					   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {