mirror of
https://github.com/friendica/friendica
synced 2025-04-25 07:10:11 +00:00
Merge branch 'develop' into task/3878-move-session-to-src
This commit is contained in:
commit
876acd68a0
70 changed files with 1346 additions and 1091 deletions
|
@ -6,7 +6,9 @@ namespace Friendica\Core;
|
|||
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use dba;
|
||||
use Memcache;
|
||||
|
||||
require_once 'include/dba.php';
|
||||
|
||||
|
@ -22,7 +24,7 @@ class Cache
|
|||
*/
|
||||
public static function memcache()
|
||||
{
|
||||
if (!class_exists('\Memcache', false)) {
|
||||
if (!class_exists('Memcache', false)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -33,7 +35,7 @@ class Cache
|
|||
$memcache_host = Config::get('system', 'memcache_host', '127.0.0.1');
|
||||
$memcache_port = Config::get('system', 'memcache_port', 11211);
|
||||
|
||||
$memcache = new \Memcache();
|
||||
$memcache = new Memcache();
|
||||
|
||||
if (!$memcache->connect($memcache_host, $memcache_port)) {
|
||||
return false;
|
||||
|
@ -145,7 +147,7 @@ class Cache
|
|||
$memcache->set(get_app()->get_hostname().":".$key, serialize($value), MEMCACHE_COMPRESSED, self::duration($duration));
|
||||
return;
|
||||
}
|
||||
$fields = ['v' => serialize($value), 'expire_mode' => $duration, 'updated' => datetime_convert()];
|
||||
$fields = ['v' => serialize($value), 'expire_mode' => $duration, 'updated' => DateTimeFormat::utcNow()];
|
||||
$condition = ['k' => $key];
|
||||
dba::update('cache', $fields, $condition, true);
|
||||
}
|
||||
|
@ -163,21 +165,21 @@ class Cache
|
|||
if (Config::get("system", "cache_cleared_day") < time() - self::duration(CACHE_DAY)) {
|
||||
if ($max_level == CACHE_MONTH) {
|
||||
$condition = ["`updated` < ? AND `expire_mode` = ?",
|
||||
datetime_convert('UTC', 'UTC', "now - 30 days"),
|
||||
DateTimeFormat::utc("now - 30 days"),
|
||||
CACHE_MONTH];
|
||||
dba::delete('cache', $condition);
|
||||
}
|
||||
|
||||
if ($max_level <= CACHE_WEEK) {
|
||||
$condition = ["`updated` < ? AND `expire_mode` = ?",
|
||||
datetime_convert('UTC', 'UTC', "now - 7 days"),
|
||||
DateTimeFormat::utc("now - 7 days"),
|
||||
CACHE_WEEK];
|
||||
dba::delete('cache', $condition);
|
||||
}
|
||||
|
||||
if ($max_level <= CACHE_DAY) {
|
||||
$condition = ["`updated` < ? AND `expire_mode` = ?",
|
||||
datetime_convert('UTC', 'UTC', "now - 1 days"),
|
||||
DateTimeFormat::utc("now - 1 days"),
|
||||
CACHE_DAY];
|
||||
dba::delete('cache', $condition);
|
||||
}
|
||||
|
@ -186,7 +188,7 @@ class Cache
|
|||
|
||||
if (($max_level <= CACHE_HOUR) && (Config::get("system", "cache_cleared_hour")) < time() - self::duration(CACHE_HOUR)) {
|
||||
$condition = ["`updated` < ? AND `expire_mode` = ?",
|
||||
datetime_convert('UTC', 'UTC', "now - 1 hours"),
|
||||
DateTimeFormat::utc("now - 1 hours"),
|
||||
CACHE_HOUR];
|
||||
dba::delete('cache', $condition);
|
||||
|
||||
|
@ -195,7 +197,7 @@ class Cache
|
|||
|
||||
if (($max_level <= CACHE_HALF_HOUR) && (Config::get("system", "cache_cleared_half_hour")) < time() - self::duration(CACHE_HALF_HOUR)) {
|
||||
$condition = ["`updated` < ? AND `expire_mode` = ?",
|
||||
datetime_convert('UTC', 'UTC', "now - 30 minutes"),
|
||||
DateTimeFormat::utc("now - 30 minutes"),
|
||||
CACHE_HALF_HOUR];
|
||||
dba::delete('cache', $condition);
|
||||
|
||||
|
@ -204,7 +206,7 @@ class Cache
|
|||
|
||||
if (($max_level <= CACHE_QUARTER_HOUR) && (Config::get("system", "cache_cleared_quarter_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) {
|
||||
$condition = ["`updated` < ? AND `expire_mode` = ?",
|
||||
datetime_convert('UTC', 'UTC', "now - 15 minutes"),
|
||||
DateTimeFormat::utc("now - 15 minutes"),
|
||||
CACHE_QUARTER_HOUR];
|
||||
dba::delete('cache', $condition);
|
||||
|
||||
|
@ -213,7 +215,7 @@ class Cache
|
|||
|
||||
if (($max_level <= CACHE_FIVE_MINUTES) && (Config::get("system", "cache_cleared_five_minute")) < time() - self::duration(CACHE_FIVE_MINUTES)) {
|
||||
$condition = ["`updated` < ? AND `expire_mode` = ?",
|
||||
datetime_convert('UTC', 'UTC', "now - 5 minutes"),
|
||||
DateTimeFormat::utc("now - 5 minutes"),
|
||||
CACHE_FIVE_MINUTES];
|
||||
dba::delete('cache', $condition);
|
||||
|
||||
|
@ -222,7 +224,7 @@ class Cache
|
|||
|
||||
if (($max_level <= CACHE_MINUTE) && (Config::get("system", "cache_cleared_minute")) < time() - self::duration(CACHE_MINUTE)) {
|
||||
$condition = ["`updated` < ? AND `expire_mode` = ?",
|
||||
datetime_convert('UTC', 'UTC', "now - 1 minutes"),
|
||||
DateTimeFormat::utc("now - 1 minutes"),
|
||||
CACHE_MINUTE];
|
||||
dba::delete('cache', $condition);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue