diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-12-07 13:31:37 -0800 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-12-07 13:31:37 -0800 |
| commit | b0b5a13131b90b8320de6f49db6c505d38b42c96 (patch) | |
| tree | 641a33e35665c3b8198fd2d641a687560342ba56 /phpBB/includes/cache/driver/redis.php | |
| parent | 74093d0fd383619ec8b58914ebe2edd68145e070 (diff) | |
| parent | 26fd70d9cdffe0107635db5f3846dbe5ea6e3fae (diff) | |
| download | forums-b0b5a13131b90b8320de6f49db6c505d38b42c96.tar forums-b0b5a13131b90b8320de6f49db6c505d38b42c96.tar.gz forums-b0b5a13131b90b8320de6f49db6c505d38b42c96.tar.bz2 forums-b0b5a13131b90b8320de6f49db6c505d38b42c96.tar.xz forums-b0b5a13131b90b8320de6f49db6c505d38b42c96.zip | |
Merge pull request #18 from p/ticket/11015
Ticket/11015
Diffstat (limited to 'phpBB/includes/cache/driver/redis.php')
| -rw-r--r-- | phpBB/includes/cache/driver/redis.php | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/phpBB/includes/cache/driver/redis.php b/phpBB/includes/cache/driver/redis.php index a768885962..960735b673 100644 --- a/phpBB/includes/cache/driver/redis.php +++ b/phpBB/includes/cache/driver/redis.php @@ -39,13 +39,39 @@ class phpbb_cache_driver_redis extends phpbb_cache_driver_memory var $redis; + /** + * Creates a redis cache driver. + * + * The following global constants affect operation: + * + * PHPBB_ACM_REDIS_HOST + * PHPBB_ACM_REDIS_PORT + * PHPBB_ACM_REDIS_PASSWORD + * PHPBB_ACM_REDIS_DB + * + * There are no publicly documented constructor parameters. + */ function __construct() { // Call the parent constructor parent::__construct(); $this->redis = new Redis(); - $this->redis->connect(PHPBB_ACM_REDIS_HOST, PHPBB_ACM_REDIS_PORT); + + $args = func_get_args(); + if (!empty($args)) + { + $ok = call_user_func_array(array($this->redis, 'connect'), $args); + } + else + { + $ok = $this->redis->connect(PHPBB_ACM_REDIS_HOST, PHPBB_ACM_REDIS_PORT); + } + + if (!$ok) + { + trigger_error('Could not connect to redis server'); + } if (defined('PHPBB_ACM_REDIS_PASSWORD')) { @@ -74,7 +100,7 @@ class phpbb_cache_driver_redis extends phpbb_cache_driver_memory /** * Unload the cache resources * - * @return void + * @return null */ function unload() { @@ -86,7 +112,7 @@ class phpbb_cache_driver_redis extends phpbb_cache_driver_memory /** * Purge cache data * - * @return void + * @return null */ function purge() { |