makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- cron now uses a locking variable to make sure it does not spawn too many webserver processes [Bug #12741]

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7947 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2007-07-25 17:58:39 +00:00
parent 4ca00cba39
commit d54b42a04b
3 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
phpBB/cron.php
View file

@ -33,6 +33,33 @@ echo base64_decode('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==
// test without flush ;)
// flush();
// make sure cron doesn't run multiple times in parallel
if ($config['cron_lock'])
{
// if the other process is running more than an hour already we have to assume it
// aborted without cleaning the lock
$time = explode(' ', $config['cron_lock']);
$time = $time[0];
if ($time + 3600 >= time())
{
exit;
}
}
define('CRON_ID', time() . ' ' . unique_id());
$sql = 'UPDATE ' . CONFIG_TABLE . "
SET config_value = '" . $db->sql_escape(CRON_ID) . "'
WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape($config['cron_lock']) . "'";
$db->sql_query($sql);
// another cron process altered the table between script start and UPDATE query so exit
if ($db->sql_affectedrows() != 1)
{
exit;
}
/**
* Run cron-like action
* Real cron-based layer will be introduced in 3.2
@ -227,6 +254,11 @@ else
garbage_collection();
}
$sql = 'UPDATE ' . CONFIG_TABLE . "
SET config_value = '0'
WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape(CRON_ID) . "'";
$db->sql_query($sql);
exit;
?>

1
phpBB/docs/CHANGELOG.html
View file

@ -277,6 +277,7 @@ p a {
<li>[Fix] Quick-Mod tools now retaining the start parameter (Bug #13537)</li>
<li>[Fix] Several fixes for custom profile fields on multi-lingual boards (Bugs #13763, #13527, #13525, #11515)</li>
<li>[Fix] Return to the mode previously selected after disaproving a post (Bug #13796)</li>
<li>[Fix] Cron now uses a locking variable to make sure it does not spawn too many webserver processes (Bug #12741)</li>
</ul>
</div>

1
phpBB/install/database_update.php
View file

@ -1233,6 +1233,7 @@ if (version_compare($current_version, '3.0.RC3', '<='))
$db->sql_query($sql);
set_config('allow_birthdays', '1');
set_config('cron_lock', '0', true);
}
_write_result($no_updates, $errored, $error_ary);