=== modified file 'INSTALL.txt' --- INSTALL.txt 2010-02-05 21:15:43 +0000 +++ INSTALL.txt 2010-02-09 23:12:00 +0000 @@ -1,4 +1,4 @@ -// $Id: INSTALL.txt,v 1.78 2010/02/05 21:15:43 dries Exp $ +// $Id: INSTALL.txt,v 1.77 2010/01/31 18:31:46 dries Exp $ CONTENTS OF THIS FILE --------------------- @@ -237,7 +237,7 @@ INSTALLATION Note, however, that cron tasks will only be executed when there are site visitors. You can enable the built-in cron feature at: - Administer > Configuration > System > Site information + Administer > Configuration and modules > Development > Maintenance mode Advanced users may want to ensure that cron tasks are executed periodically. To do this, visit the page "cron.php", which executes maintenance tasks on === modified file 'includes/common.inc' --- includes/common.inc 2010-02-09 12:29:39 +0000 +++ includes/common.inc 2010-02-09 23:12:00 +0000 @@ -4519,8 +4519,6 @@ function _drupal_bootstrap_full() { fix_gpc_magic(); // Load all enabled modules module_load_all(); - // Register automated cron run handler. - register_shutdown_function('system_run_automated_cron'); // Make sure all stream wrappers are registered. file_get_stream_wrappers(); if (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], 'simpletest') !== FALSE) { === modified file 'modules/system/system.admin.inc' --- modules/system/system.admin.inc 2010-02-07 17:29:09 +0000 +++ modules/system/system.admin.inc 2010-02-09 23:12:00 +0000 @@ -1560,6 +1560,7 @@ function system_site_information_setting ); $form['#validate'][] = 'system_site_information_settings_validate'; + $form['#submit'][] = 'system_site_information_settings_submit'; return system_settings_form($form, FALSE); } @@ -1581,6 +1582,18 @@ function system_site_information_setting } /** + * Form submit handler for the site-information form. + */ +function system_site_information_settings_submit($form, &$form_state) { + // Clear caches when the cron threshold is changed to ensure that the cron + // image is not contained in cached pages. + $cron_threshold = variable_get('cron_safe_threshold', DRUPAL_CRON_DEFAULT_THRESHOLD); + if ($cron_threshold != $form_state['input']['cron_safe_threshold']) { + cache_clear_all(); + } +} + +/** * Form builder; Configure error reporting settings. * * @ingroup forms === modified file 'modules/system/system.module' --- modules/system/system.module 2010-02-07 17:29:09 +0000 +++ modules/system/system.module 2010-02-09 23:12:00 +0000 @@ -524,6 +524,13 @@ function system_menu() { 'type' => MENU_CALLBACK, 'file' => 'system.admin.inc', ); + $items['system/run-cron-check'] = array( + 'title' => 'Execute cron', + 'page callback' => 'system_run_cron_check', + 'access callback' => 'system_run_cron_check_access', + 'type' => MENU_CALLBACK, + 'file' => 'system.admin.inc', + ); $items['admin'] = array( 'title' => 'Administer', 'access arguments' => array('access administration pages'), @@ -3074,6 +3081,32 @@ function system_retrieve_file($url, $des } /** + * Implements hook_page_build(). + */ +function system_page_build(&$page) { + // Automatic cron runs. + $cron_threshold = variable_get('cron_safe_threshold', DRUPAL_CRON_DEFAULT_THRESHOLD); + if ($cron_threshold) { + $page['page_bottom']['run_cron'] = array( + // Trigger cron run via AJAX. + '#attached' => array( + 'js' => array( + drupal_get_path('module', 'system') . '/system.cron.js' => array('weight' => JS_DEFAULT - 5), + array( + 'data' => array( + // Add the timestamp for the next automatic cron run. + 'cronCheck' => variable_get('cron_last', 0) + $cron_threshold, + ), + 'type' => 'setting', + ), + + ), + ), + ); + } +} + +/** * Implements hook_page_alter(). */ function system_page_alter(&$page) { @@ -3089,15 +3122,65 @@ function system_page_alter(&$page) { } /** - * Run the automated cron if enabled. - */ -function system_run_automated_cron() { - if (($threshold = variable_get('cron_safe_threshold', DRUPAL_CRON_DEFAULT_THRESHOLD)) > 0) { + * Menu callback; executes cron via an AJAX callback. + * + * This callback runs cron in a separate HTTP request to prevent "mysterious" + * slow-downs of regular HTTP requests. It is invoked via an AJAX request and + * does not process the returned output. + * + * @see system_page_alter() + * @see system_run_cron_check_access() + */ +function system_run_cron_check() { + $cron_run = FALSE; + $cron_threshold = variable_get('cron_safe_threshold', DRUPAL_CRON_DEFAULT_THRESHOLD); + + // Cron threshold semaphore is used to avoid errors every time the image + // callback is displayed when a previous cron is still running. + $threshold_semaphore = variable_get('cron_threshold_semaphore', FALSE); + if ($threshold_semaphore) { + if (REQUEST_TIME - $threshold_semaphore > 3600) { + // Either cron has been running for more than an hour or the semaphore + // was not reset due to a database error. + watchdog('cron', 'Cron has been running for more than an hour and is most likely stuck.', array(), WATCHDOG_ERROR); + + // Release the cron threshold semaphore. + variable_del('cron_threshold_semaphore'); + } + } + else { $cron_last = variable_get('cron_last', NULL); - if (!isset($cron_last) || (REQUEST_TIME - $cron_last > $threshold)) { - drupal_cron_run(); + // Run cron automatically if it has never run or threshold was crossed. + if (!isset($cron_last) || (REQUEST_TIME - $cron_last > $cron_threshold)) { + // Lock cron threshold semaphore. + variable_set('cron_threshold_semaphore', REQUEST_TIME); + $cron_run = drupal_cron_run(); + // Release the cron threshold semaphore. + variable_del('cron_threshold_semaphore'); } } + + // Add an expires header with the time of the next cron run. + $cron_last = variable_get('cron_last', NULL); + drupal_add_http_header('Expires', gmdate(DATE_RFC1123, $cron_last + $cron_threshold)); + + drupal_json_output(array('cron_run' => $cron_run)); + drupal_page_footer(); +} + +/** + * Checks if the feature to automatically run cron is enabled. + * + * Also used as a menu access callback for this feature. + * + * @return + * TRUE if cron threshold is enabled, FALSE otherwise. + * + * @see system_run_cron_check() + * @see system_page_alter() + */ +function system_run_cron_check_access() { + return variable_get('cron_safe_threshold', DRUPAL_CRON_DEFAULT_THRESHOLD) > 0; } /** === modified file 'modules/system/system.test' --- modules/system/system.test 2010-02-05 21:15:43 +0000 +++ modules/system/system.test 2010-02-09 23:12:00 +0000 @@ -1,5 +1,5 @@ drupalGet(''); + $this->assertRaw('"cronCheck":' . ($cron_last + $cron_safe_threshold)); + $this->drupalGet('system/run-cron-check'); + $this->assertExpiresHeader($cron_last + $cron_safe_threshold); $this->assertTrue($cron_last == variable_get('cron_last', NULL), t('Cron does not run when the cron threshold is not passed.')); // Test if cron runs when the cron threshold was passed. $cron_last = time() - 200; variable_set('cron_last', $cron_last); $this->drupalGet(''); + $this->assertRaw('"cronCheck":' . ($cron_last + $cron_safe_threshold)); sleep(1); + $this->drupalGet('system/run-cron-check'); + $this->assertExpiresHeader(variable_get('cron_last', NULL) + $cron_safe_threshold); $this->assertTrue($cron_last < variable_get('cron_last', NULL), t('Cron runs when the cron threshold is passed.')); // Disable the cron threshold through the interface. @@ -455,10 +461,25 @@ class CronRunTestCase extends DrupalWebT $cron_last = time() - 200; variable_set('cron_last', $cron_last); $this->drupalGet(''); + $this->assertNoRaw('cronCheck'); + $this->drupalGet('system/run-cron-check'); + $this->assertResponse(403); $this->assertTrue($cron_last == variable_get('cron_last', NULL), t('Cron does not run when the cron threshold is disabled.')); } /** + * Assert that the Expires header is a specific timestamp. + * + * @param $timestamp + * The timestamp value to match against the header. + */ + private function assertExpiresHeader($timestamp) { + $expires = $this->drupalGetHeader('Expires'); + $expires = strtotime($expires); + $this->assertEqual($expires, $timestamp, t('Expires header expected @expected got @actual.', array('@expected' => $timestamp, '@actual' => $expires))); + } + + /** * Ensure that temporary files are removed. * * Create files for all the possible combinations of age and status. We are