Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45 from radiorabe/feature/remove-pref-cache-in-mvc 

completely remove deactivated cache
This commit is contained in:
Robb 2017-03-09 20:37:42 -05:00 committed by GitHub
parent 4e8e965dd1 21356d1894
commit be00c68ed0
3 changed files with 0 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
airtime_mvc/application/models/Cache.php
View File

@ -1,45 +0,0 @@
<?php
class Cache
{
private function createCacheKey($key, $isUserValue, $userId = null) {
$CC_CONFIG = Config::getConfig();
$a = $CC_CONFIG["apiKey"][0];
if ($isUserValue) {
$cacheKey = "{$key}{$userId}{$a}";
}
else {
$cacheKey = "{$key}{$a}";
}
return $cacheKey;
}
public function store($key, $value, $isUserValue, $userId = null) {
$cacheKey = self::createCacheKey($key, $userId);
//XXX: Disabling APC on SaaS because it turns out we have multiple webservers
// running, which means we have to use a distributed data cache like memcached.
//return apc_store($cacheKey, $value);
return false;
}
public function fetch($key, $isUserValue, $userId = null) {
$cacheKey = self::createCacheKey($key, $isUserValue, $userId);
//XXX: Disabling APC on SaaS because it turns out we have multiple webservers
// running, which means we have to use a distributed data cache like memcached.
//return apc_fetch($cacheKey);
return false;
}
public static function clear()
{
// Disabled on SaaS
// apc_clear_cache('user');
// apc_clear_cache();
}
}

10
airtime_mvc/application/models/Preference.php
View File

@ -23,7 +23,6 @@ class Application_Model_Preference
*/ */
private static function setValue($key, $value, $isUserValue = false) private static function setValue($key, $value, $isUserValue = false)
{ {
$cache = new Cache();
$con = Propel::getConnection(CcPrefPeer::DATABASE_NAME); $con = Propel::getConnection(CcPrefPeer::DATABASE_NAME);
//We are using row-level locking in Postgres via "FOR UPDATE" instead of a transaction here //We are using row-level locking in Postgres via "FOR UPDATE" instead of a transaction here
@ -109,8 +108,6 @@ class Application_Model_Preference
Logging::info("Database error: ".$e->getMessage()); Logging::info("Database error: ".$e->getMessage());
exit; exit;
} }
$cache->store($key, $value, $isUserValue, $userId);
} }
/** /**
@ -143,8 +140,6 @@ class Application_Model_Preference
*/ */
private static function getValue($key, $isUserValue = false, $forceDefault = false) private static function getValue($key, $isUserValue = false, $forceDefault = false)
{ {
$cache = new Cache();
try { try {
$userId = null; $userId = null;
@ -156,10 +151,6 @@ class Application_Model_Preference
} }
} }
// If the value is already cached, return it
$res = $cache->fetch($key, $isUserValue, $userId);
if ($res !== false) return $res;
//Check if key already exists //Check if key already exists
$sql = "SELECT COUNT(*) FROM cc_pref" $sql = "SELECT COUNT(*) FROM cc_pref"
." WHERE keystr = :key"; ." WHERE keystr = :key";
@ -198,7 +189,6 @@ class Application_Model_Preference
$res = ($result !== false) ? $result : ""; $res = ($result !== false) ? $result : "";
} }
$cache->store($key, $res, $isUserValue, $userId);
return $res; return $res;
} }
catch (Exception $e) { catch (Exception $e) {

5
airtime_mvc/application/upgrade/Upgrades.php
View File

@ -187,18 +187,15 @@ abstract class AirtimeUpgrader
* allowing child classes to overwrite _runUpgrade to reduce duplication * allowing child classes to overwrite _runUpgrade to reduce duplication
*/ */
public function upgrade() { public function upgrade() {
Cache::clear();
assert($this->checkIfUpgradeSupported()); assert($this->checkIfUpgradeSupported());
try { try {
// $this->toggleMaintenanceScreen(true); // $this->toggleMaintenanceScreen(true);
Cache::clear();
$this->_getDbValues(); $this->_getDbValues();
$this->_runUpgrade(); $this->_runUpgrade();
Application_Model_Preference::SetSchemaVersion($this->getNewVersion()); Application_Model_Preference::SetSchemaVersion($this->getNewVersion());
Cache::clear();
// $this->toggleMaintenanceScreen(false); // $this->toggleMaintenanceScreen(false);
} catch(Exception $e) { } catch(Exception $e) {
@ -215,7 +212,6 @@ abstract class AirtimeUpgrader
* allowing child classes to overwrite _runDowngrade to reduce duplication * allowing child classes to overwrite _runDowngrade to reduce duplication
*/ */
public function downgrade() { public function downgrade() {
Cache::clear();
try { try {
$this->_getDbValues(); $this->_getDbValues();
@ -232,7 +228,6 @@ abstract class AirtimeUpgrader
// Set the schema version to the highest supported version so we don't skip versions when downgrading // Set the schema version to the highest supported version so we don't skip versions when downgrading
Application_Model_Preference::SetSchemaVersion($highestSupportedVersion); Application_Model_Preference::SetSchemaVersion($highestSupportedVersion);
Cache::clear();
} catch(Exception $e) { } catch(Exception $e) {
return false; return false;
} }