friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Renamed Cache flag

This commit is contained in:
Philipp Holzer 2018-10-29 10:21:10 +01:00
parent 270e817954
commit 9690dfc54e
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Cache.php
View File

@ -19,7 +19,7 @@ class Cache extends \Friendica\BaseObject
const QUARTER_HOUR = 900;
const FIVE_MINUTES = 300;
const MINUTE = 60;
const NEVER = 0;
const INFINITE = 0;
/**
* @var Cache\ICacheDriver

7
src/Core/Update.php
View File

@ -71,7 +71,7 @@ class Update
// Compare the current structure with the defined structure
// If the Lock is acquired, never release it automatically to avoid double updates
if (Lock::acquire('dbupdate', 120, Cache::NEVER)) {
if (Lock::acquire('dbupdate', 120, Cache::INFINITE)) {
// run the pre_update_nnnn functions in update.php
for ($x = $stored + 1; $x <= $current; $x++) {
@ -90,7 +90,6 @@ class Update
$retval
);
}
Lock::release('dbcheck');
Lock::release('dbupdate');
return $retval;
} else {
@ -138,7 +137,7 @@ class Update
// If the update fails or times-out completely you may need to
// delete the config entry to try again.
if (Lock::acquire('dbupdate_function', 120,Cache::NEVER)) {
if (Lock::acquire('dbupdate_function', 120,Cache::INFINITE)) {
// call the specific update
$retval = $funcname();
@ -241,7 +240,7 @@ class Update
L10n::pushLang($lang);
$preamble = deindent(L10n::t("
The friendica database was successfully update from %s to %s.",
The friendica database was successfully updated from %s to %s.",
$from_build, $to_build));
notification([