commit 257529533d3405af1eeb0427df58e45de30fbd2e Author: Hai-Nam Nguyen Date: Sun Apr 29 12:08:19 2012 +0200 Issue #1493098: Convert cron settings to configuration system diff --git a/core/cron.php b/core/cron.php index fa9aa14..301047a 100644 --- a/core/cron.php +++ b/core/cron.php @@ -16,7 +16,7 @@ define('DRUPAL_ROOT', getcwd()); include_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); -if (!isset($_GET['cron_key']) || variable_get('cron_key', 'drupal') != $_GET['cron_key']) { +if (!isset($_GET['cron_key']) || config('system.cron')->get('cron_key') != $_GET['cron_key']) { watchdog('cron', 'Cron could not run because an invalid key was used.', array(), WATCHDOG_NOTICE); drupal_access_denied(); } diff --git a/core/modules/aggregator/aggregator.test b/core/modules/aggregator/aggregator.test index 61ad16b..ff41561 100644 --- a/core/modules/aggregator/aggregator.test +++ b/core/modules/aggregator/aggregator.test @@ -798,7 +798,7 @@ class AggregatorCronTestCase extends AggregatorTestCase { public function testCron() { // Create feed and test basic updating on cron. global $base_url; - $key = variable_get('cron_key', 'drupal'); + $key = config('system.cron')->get('cron_key'); $this->createSampleNodes(); $feed = $this->createFeed(); $this->drupalGet($base_url . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); diff --git a/core/modules/simpletest/drupal_web_test_case.php b/core/modules/simpletest/drupal_web_test_case.php index 540dc0e..6805170 100644 --- a/core/modules/simpletest/drupal_web_test_case.php +++ b/core/modules/simpletest/drupal_web_test_case.php @@ -2186,7 +2186,7 @@ class DrupalWebTestCase extends DrupalTestCase { * Runs cron in the Drupal installed by Simpletest. */ protected function cronRun() { - $this->drupalGet($GLOBALS['base_url'] . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => variable_get('cron_key', 'drupal')))); + $this->drupalGet($GLOBALS['base_url'] . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => config('system.cron')->get('cron_key')))); } /** diff --git a/core/modules/system/config/system.cron.xml b/core/modules/system/config/system.cron.xml new file mode 100644 index 0000000..5e95b98 --- /dev/null +++ b/core/modules/system/config/system.cron.xml @@ -0,0 +1,8 @@ + + + 10800 + 10800 + 172800 + 1209600 + drupal + diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index aac0c3d..2e55fc3 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -1569,7 +1569,7 @@ function system_site_information_settings_validate($form, &$form_state) { * @see system_settings_form() * @ingroup forms */ -function system_cron_settings() { +function system_cron_settings($form, &$form_state) { $form['description'] = array( '#markup' => '

' . t('Cron takes care of running periodic tasks like checking for updates and indexing content for search.') . '

', ); @@ -1588,11 +1588,29 @@ function system_cron_settings() { $form['cron']['cron_safe_threshold'] = array( '#type' => 'select', '#title' => t('Run cron every'), - '#default_value' => variable_get('cron_safe_threshold', DRUPAL_CRON_DEFAULT_THRESHOLD), + '#default_value' => config('system.cron')->get('cron_safe_threshold'), '#options' => array(0 => t('Never')) + drupal_map_assoc(array(3600, 10800, 21600, 43200, 86400, 604800), 'format_interval'), ); + $form_state['config']['cron_safe_threshold'] = array( + 'name' => 'system.cron', + 'path' => 'cron_safe_threshold', + ); + + $form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration')); + return $form; +} - return system_settings_form($form); +/** + * Form builder submit handler; Handle submission for cron settings. + * + * @ingroup forms + * @see system_settings_form() + */ +function system_cron_settings_submit($form, &$form_state) { + $config = config('system.cron'); + $config->set('cron_safe_threshold', $form_state['values']['cron_safe_threshold']); + $config->save(); + drupal_set_message(t('The configuration options have been saved.')); } /** diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 51603ff..4c6c26b 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -253,10 +253,11 @@ function system_requirements($phase) { // Report cron status. if ($phase == 'runtime') { + $config = config('system.cron'); // Cron warning threshold defaults to two days. - $threshold_warning = variable_get('cron_threshold_warning', 172800); + $threshold_warning = $config->get('cron_threshold_warning'); // Cron error threshold defaults to two weeks. - $threshold_error = variable_get('cron_threshold_error', 1209600); + $threshold_error = $config->get('cron_threshold_error'); // Cron configuration help text. $help = $t('For more information, see the online handbook entry for configuring cron jobs.', array('@cron-handbook' => 'http://drupal.org/cron')); @@ -283,7 +284,7 @@ function system_requirements($phase) { } $description .= ' ' . $t('You can run cron manually.', array('@cron' => url('admin/reports/status/run-cron'))); - $description .= '
' . $t('To run cron from outside the site, go to !cron', array('!cron' => url($base_url . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => variable_get('cron_key', 'drupal')))))); + $description .= '
' . $t('To run cron from outside the site, go to !cron', array('!cron' => url($base_url . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => config('system.cron')->get('cron_key')))))); $requirements['cron'] = array( 'title' => $t('Cron maintenance tasks'), @@ -515,7 +516,9 @@ function system_install() { // Populate the cron key variable. $cron_key = drupal_hash_base64(drupal_random_bytes(55)); - variable_set('cron_key', $cron_key); + config('system.cron') + ->set('cron_key', $cron_key) + ->save(); } /** @@ -1849,6 +1852,13 @@ function system_update_8007() { } /** + * Moves cron system settings from variable to config. + */ +function system_update_8006() { + update_variables_to_config('system.cron'); +} + +/** * @} End of "defgroup updates-7.x-to-8.x" * The next series of updates should start at 9000. */ diff --git a/core/modules/system/system.module b/core/modules/system/system.module index dfb8936..afb02b7 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -11,11 +11,6 @@ const DRUPAL_MAXIMUM_TEMP_FILE_AGE = 21600; /** - * Default interval for automatic cron executions in seconds. - */ -const DRUPAL_CRON_DEFAULT_THRESHOLD = 10800; - -/** * New users will be set to the default time zone at registration. */ const DRUPAL_USER_TIMEZONE_DEFAULT = 0; @@ -3526,7 +3521,7 @@ function system_run_automated_cron() { // If the site is not fully installed, suppress the automated cron run. // Otherwise it could be triggered prematurely by Ajax requests during // installation. - if (($threshold = variable_get('cron_safe_threshold', DRUPAL_CRON_DEFAULT_THRESHOLD)) > 0 && variable_get('install_task') == 'done') { + if (($threshold = config('system.cron')->get('cron_safe_threshold')) > 0 && variable_get('install_task') == 'done') { $cron_last = variable_get('cron_last', NULL); if (!isset($cron_last) || (REQUEST_TIME - $cron_last > $threshold)) { drupal_cron_run(); diff --git a/core/modules/system/system.test b/core/modules/system/system.test index 16348cc..755aa52 100644 --- a/core/modules/system/system.test +++ b/core/modules/system/system.test @@ -820,7 +820,7 @@ class CronRunTestCase extends DrupalWebTestCase { $this->assertResponse(403); // Run cron anonymously with the valid cron key. - $key = variable_get('cron_key', 'drupal'); + $key = config('system.cron')->get('cron_key'); $this->drupalGet($base_url . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); $this->assertResponse(200); } @@ -837,7 +837,9 @@ class CronRunTestCase extends DrupalWebTestCase { $cron_last = time(); $cron_safe_threshold = 100; variable_set('cron_last', $cron_last); - variable_set('cron_safe_threshold', $cron_safe_threshold); + config('system.cron') + ->set('cron_safe_threshold', $cron_safe_threshold) + ->save(); $this->drupalGet(''); $this->assertTrue($cron_last == variable_get('cron_last', NULL), t('Cron does not run when the cron threshold is not passed.'));