sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6158 from nextcloud/always-log-cron-execution 

Always log cron execution
pull/6169/head
Lukas Reschke 2017-08-17 11:14:12 +07:00 committed by GitHub
parent a53aa40b4d 1c38a83927
commit e37cf2d6f0
5 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/config.sample.php
Unescape Escape View File

@ -738,13 +738,6 @@ $CONFIG = array(
*/
'log_query' => false,
/**
* Log successful cron runs.
*
* Defaults to ``true``
*/
'cron_log' => true,
/**
* Enables log rotation and limits the total size of logfiles. The default is 0,
* or no rotation. Specify a size in bytes, for example 104857600 (100 megabytes

4
cron.php
Unescape Escape View File

@ -152,9 +152,7 @@ try {
}
// Log the successful cron execution
if (\OC::$server->getConfig()->getSystemValue('cron_log', true)) {
\OC::$server->getConfig()->setAppValue('core', 'lastcron', time());
}
\OC::$server->getConfig()->setAppValue('core', 'lastcron', time());
exit();
} catch (Exception $ex) {

1
lib/private/Settings/Admin/Server.php
Unescape Escape View File

@ -130,7 +130,6 @@ class Server implements ISettings {
// Background jobs
'backgroundjobs_mode' => $this->config->getAppValue('core', 'backgroundjobs_mode', 'ajax'),
'cron_log' => $this->config->getSystemValue('cron_log', true),
'lastcron' => $this->config->getAppValue('core', 'lastcron', false),
'cronErrors' => $this->config->getAppValue('core', 'cronErrors'),
'cli_based_cron_possible' => function_exists('posix_getpwuid'),

40
settings/templates/settings/admin/server.php
Unescape Escape View File

@ -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>

10
tests/lib/Settings/Admin/ServerTest.php
Unescape Escape View File

@ -80,12 +80,12 @@ class ServerTest extends TestCase {
->with('core', 'backgroundjobs_mode', 'ajax')
->willReturn('ajax');
$this->config
->expects($this->at(4))
->expects($this->at(3))
->method('getAppValue')
->with('core', 'lastcron', false)
->willReturn(false);
$this->config
->expects($this->at(5))
->expects($this->at(4))
->method('getAppValue')
->with('core', 'cronErrors')
->willReturn('');
@ -94,11 +94,6 @@ class ServerTest extends TestCase {
->method('getSystemValue')
->with('check_for_working_wellknown_setup', true)
->willReturn(true);
$this->config
->expects($this->at(3))
->method('getSystemValue')
->with('cron_log', true)
->willReturn(true);
$this->l10n
->expects($this->at(0))
->method('t')
@ -139,7 +134,6 @@ class ServerTest extends TestCase {
// Background jobs
'backgroundjobs_mode' => 'ajax',
'cron_log' => true,
'lastcron' => false,
'cronErrors' => '',
'cli_based_cron_possible' => true,