eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

move memcache connections to util.php

Browse Source 
darcs-hash:20080926200102-5ed1f-debbc18981424d7724277ac82e5fbfd5e797090e.gz
This commit is contained in:
Evan Prodromou 2008-09-26 16:01:02 -04:00
parent 15c0fb7abd
commit 82084ab74c
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
classes/Memcached_DataObject.php
View File

@ -69,20 +69,7 @@ class Memcached_DataObject extends DB_DataObject
} }
static function memcache() { static function memcache() {
if (!common_config('memcached', 'enabled')) { return common_memcache();
return NULL;
} else {
$cache = new Memcache();
$servers = common_config('memcached', 'server');
if (is_array($servers)) {
foreach($servers as $server) {
$cache->addServer($server);
}
} else {
$cache->addServer($servers);
}
return $cache;
}
} }
static function cacheKey($cls, $k, $v) { static function cacheKey($cls, $k, $v) {

4
classes/Notice.php
View File

@ -125,8 +125,8 @@ class Notice extends Memcached_DataObject
} }
function blowSubsCache() { function blowSubsCache() {
$cache = new Memcache(); $cache = common_memcache();
if ($cache->connect(common_config('memcached', 'server'), common_config('memcached', 'port'))) { if ($cache) {
$user = new User(); $user = new User();
$user->query('SELECT id ' . $user->query('SELECT id ' .

5
classes/User.php
View File

@ -196,10 +196,9 @@ class User extends Memcached_DataObject
function noticesWithFriendsWindow() { function noticesWithFriendsWindow() {
$cache = new Memcache(); $cache = common_memcache();
$res = $cache->connect(common_config('memcached', 'server'), common_config('memcached', 'port'));
if (!$res) { if (!$cache) {
return NULL; return NULL;
} }

20
lib/util.php
View File

@ -1728,3 +1728,23 @@ function common_message_form($content, $user, $to) {
common_element_end('p'); common_element_end('p');
common_element_end('form'); common_element_end('form');
} }
function common_memcache() {
static $cache = NULL;
if (!common_config('memcached', 'enabled')) {
return NULL;
} else {
if (!$cache) {
$cache = new Memcache();
$servers = common_config('memcached', 'server');
if (is_array($servers)) {
foreach($servers as $server) {
$cache->addServer($server);
}
} else {
$cache->addServer($servers);
}
}
return $cache;
}
}