GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

common_memcache() => Cache::instance()

Browse Source
This commit is contained in:
Evan Prodromou 2010-09-06 09:56:45 -04:00
parent 6fe2429c41
commit 8f81762d68
16 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/getfile.php
View File

@ -129,7 +129,7 @@ class GetfileAction extends Action
return null;
}
$cache = common_memcache();
$cache = Cache::instance();
if($cache) {
$key = common_cache_key('attachments:etag:' . $this->path);
$etag = $cache->get($key);

2
classes/Memcached_DataObject.php
View File

@ -124,7 +124,7 @@ class Memcached_DataObject extends Safe_DataObject
}
static function memcache() {
return common_memcache();
return Cache::instance();
}
static function cacheKey($cls, $k, $v) {

6
classes/Notice.php
View File

@ -591,7 +591,7 @@ class Notice extends Memcached_DataObject
function getStreamByIds($ids)
{
$cache = common_memcache();
$cache = Cache::instance();
if (!empty($cache)) {
$notices = array();
@ -1585,7 +1585,7 @@ class Notice extends Memcached_DataObject
function stream($fn, $args, $cachekey, $offset=0, $limit=20, $since_id=0, $max_id=0)
{
$cache = common_memcache();
$cache = Cache::instance();
if (empty($cache) ||
$since_id != 0 || $max_id != 0 ||
@ -1777,7 +1777,7 @@ class Notice extends Memcached_DataObject
function repeatStream($limit=100)
{
$cache = common_memcache();
$cache = Cache::instance();
if (empty($cache)) {
$ids = $this->_repeatStreamDirect($limit);

16
classes/Profile.php
View File

@ -429,7 +429,7 @@ class Profile extends Memcached_DataObject
function subscriptionCount()
{
$c = common_memcache();
$c = Cache::instance();
if (!empty($c)) {
$cnt = $c->get(common_cache_key('profile:subscription_count:'.$this->id));
@ -454,7 +454,7 @@ class Profile extends Memcached_DataObject
function subscriberCount()
{
$c = common_memcache();
$c = Cache::instance();
if (!empty($c)) {
$cnt = $c->get(common_cache_key('profile:subscriber_count:'.$this->id));
if (is_integer($cnt)) {
@ -476,7 +476,7 @@ class Profile extends Memcached_DataObject
function faveCount()
{
$c = common_memcache();
$c = Cache::instance();
if (!empty($c)) {
$cnt = $c->get(common_cache_key('profile:fave_count:'.$this->id));
if (is_integer($cnt)) {
@ -497,7 +497,7 @@ class Profile extends Memcached_DataObject
function noticeCount()
{
$c = common_memcache();
$c = Cache::instance();
if (!empty($c)) {
$cnt = $c->get(common_cache_key('profile:notice_count:'.$this->id));
@ -519,7 +519,7 @@ class Profile extends Memcached_DataObject
function blowSubscriberCount()
{
$c = common_memcache();
$c = Cache::instance();
if (!empty($c)) {
$c->delete(common_cache_key('profile:subscriber_count:'.$this->id));
}
@ -527,7 +527,7 @@ class Profile extends Memcached_DataObject
function blowSubscriptionCount()
{
$c = common_memcache();
$c = Cache::instance();
if (!empty($c)) {
$c->delete(common_cache_key('profile:subscription_count:'.$this->id));
}
@ -535,7 +535,7 @@ class Profile extends Memcached_DataObject
function blowFaveCount()
{
$c = common_memcache();
$c = Cache::instance();
if (!empty($c)) {
$c->delete(common_cache_key('profile:fave_count:'.$this->id));
}
@ -543,7 +543,7 @@ class Profile extends Memcached_DataObject
function blowNoticeCount()
{
$c = common_memcache();
$c = Cache::instance();
if (!empty($c)) {
$c->delete(common_cache_key('profile:notice_count:'.$this->id));
}

4
classes/User.php
View File

@ -388,7 +388,7 @@ class User extends Memcached_DataObject
function hasFave($notice)
{
$cache = common_memcache();
$cache = Cache::instance();
// XXX: Kind of a hack.
@ -487,7 +487,7 @@ class User extends Memcached_DataObject
function blowFavesCache()
{
$cache = common_memcache();
$cache = Cache::instance();
if ($cache) {
// Faves don't happen chronologically, so we need to blow
// ;last cache, too

2
lib/spawningdaemon.php
View File

@ -204,7 +204,7 @@ abstract class SpawningDaemon extends Daemon
// Reconnect main memcached, or threads will stomp on
// each other and corrupt their requests.
$cache = common_memcache();
$cache = Cache::instance();
if ($cache) {
$cache->reconnect();
}

2
lib/stompqueuemanager.php
View File

@ -578,7 +578,7 @@ class StompQueueManager extends QueueManager
function incDeliveryCount($msgId)
{
$count = 0;
$cache = common_memcache();
$cache = Cache::instance();
if ($cache) {
$key = 'statusnet:stomp:message-retries:' . $msgId;
$count = $cache->increment($key);

6
lib/util.php
View File

@ -142,7 +142,6 @@ function common_switch_locale($language=null)
textdomain("statusnet");
}
function common_timezone()
{
if (common_logged_in()) {
@ -1809,11 +1808,6 @@ function common_keyize($str)
return Cache::keyize($str);
}
function common_memcache()
{
return Cache::instance();
}
function common_license_terms($uri)
{
if(preg_match('/creativecommons.org\/licenses\/([^\/]+)/', $uri, $matches)) {

4
plugins/GeonamesPlugin.php
View File

@ -384,7 +384,7 @@ class GeonamesPlugin extends Plugin
function getCache($attrs)
{
$c = common_memcache();
$c = Cache::instance();
if (empty($c)) {
return null;
@ -399,7 +399,7 @@ class GeonamesPlugin extends Plugin
function setCache($attrs, $loc)
{
$c = common_memcache();
$c = Cache::instance();
if (empty($c)) {
return null;

2
plugins/LdapCommon/LdapCommon.php
View File

@ -126,7 +126,7 @@ class LdapCommon
}
throw new Exception('Could not connect to LDAP server: '.$err->getMessage());
}
$c = common_memcache();
$c = Cache::instance();
if (!empty($c)) {
$cacheObj = new MemcacheSchemaCache(
array('c'=>$c,

4
plugins/Minify/MinifyPlugin.php
View File

@ -119,7 +119,7 @@ class MinifyPlugin extends Plugin
function onStartInlineScriptElement($action,&$code,&$type)
{
if($this->minifyInlineJs && $type=='text/javascript'){
$c = common_memcache();
$c = Cache::instance();
if (!empty($c)) {
$cacheKey = common_cache_key(self::cacheKey . ':' . crc32($code));
$out = $c->get($cacheKey);
@ -139,7 +139,7 @@ class MinifyPlugin extends Plugin
function onStartStyleElement($action,&$code,&$type,&$media)
{
if($this->minifyInlineCss && $type=='text/css'){
$c = common_memcache();
$c = Cache::instance();
if (!empty($c)) {
$cacheKey = common_cache_key(self::cacheKey . ':' . crc32($code));
$out = $c->get($cacheKey);

2
plugins/Minify/minify.php
View File

@ -74,7 +74,7 @@ class MinifyAction extends Action
{
parent::handle($args);
$c = common_memcache();
$c = Cache::instance();
if (!empty($c)) {
$cacheKey = common_cache_key(MinifyPlugin::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v);
$out = $c->get($cacheKey);

2
scripts/clearcache.php
View File

@ -55,7 +55,7 @@ if (!empty($karg)) {
print "Clearing key '$k'...";
$c = common_memcache();
$c = Cache::instance();
if (empty($c)) {
die("Can't initialize cache object!\n");

2
scripts/fixup_inboxes.php
View File

@ -46,7 +46,7 @@ if ($start_at) {
}
$cnt = $user->find();
$cache = common_memcache();
$cache = Cache::instance();
while ($user->fetch()) {
common_log(LOG_INFO, 'Updating inbox for user ' . $user->id);

2
scripts/showcache.php
View File

@ -55,7 +55,7 @@ if (!empty($karg)) {
print "Checking key '$k'...\n";
$c = common_memcache();
$c = Cache::instance();
if (empty($c)) {
die("Can't initialize cache object!\n");

2
scripts/uncache_users.php
View File

@ -34,7 +34,7 @@ common_log(LOG_INFO, 'Updating user inboxes.');
$ids = file($id_file);
$memc = common_memcache();
$memc = Cache::instance();
foreach ($ids as $id) {