Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved memcache instantiation inside an if() that checks for cache_config and also that memcache exists using class_exists().

Browse Source 
This should let us still do development on chameleon without requiring the memcache extension.


git-svn-id: svn://10.0.0.236/trunk@192510 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mike.morgan%oregonstate.edu 2006-03-17 00:56:47 +00:00
parent 01c5812080
commit 579fb6e99b
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/webtools/addons/public/inc/init.php
View File

@ -48,18 +48,21 @@ define('SCRIPT_NAME',substr($_SERVER['SCRIPT_NAME'], strlen(WEB_PATH.'/'), strle
*/
$memcacheId = md5(SCRIPT_NAME.$_SERVER['QUERY_STRING']);
/**
* Instantiate our memcache object.
*/
$cache = new memcache();
/**
* Check the cache_config to see if the current page is supposed to be cached.
* If it is, try to connect. If connection to the cache server fails, fall back on regular runtime.
* We also are storing the status of the connection in $memcacheConnected for use in finish.php.
*/
if (!empty($cache_config[SCRIPT_NAME]) ) {
if (!empty($cache_config[SCRIPT_NAME]) && class_exists('memcache') ) {
/**
* Instantiate our memcache object.
*/
$cache = new memcache();
/**
* Boolean so we know whether or not we've found a valid memcached server.
*/
$memcacheConnected = false;
if (is_array($memcache_config)) {
@ -85,9 +88,9 @@ if (!empty($cache_config[SCRIPT_NAME]) ) {
}
} else {
/**
/**
* If we get here, it means we were supposed to read from cache, but couldn't connect to memcached.
* Log the message, then continue with runtime.
* Log the message, then continue with runtime.
*/
error_log('Memcache Error: Unable connect to memcache server. Please check configuration and try again.');
}