diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-03 17:17:50 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-03 17:17:50 +0100 |
| commit | 49f29259003da180c008a6bb6e0d5605c3a79bd9 (patch) | |
| tree | 13e7ff812d8efec5bec854c1e44d1006dcf50e1c /phpBB | |
| parent | 34018ed1d63942ff96828d298c10895db1623c9a (diff) | |
| parent | db6b11a3902c27b612d7d6d4696c4cd8cf1f0bdf (diff) | |
| download | forums-49f29259003da180c008a6bb6e0d5605c3a79bd9.tar forums-49f29259003da180c008a6bb6e0d5605c3a79bd9.tar.gz forums-49f29259003da180c008a6bb6e0d5605c3a79bd9.tar.bz2 forums-49f29259003da180c008a6bb6e0d5605c3a79bd9.tar.xz forums-49f29259003da180c008a6bb6e0d5605c3a79bd9.zip | |
Merge remote-tracking branch 'p/ticket/9983' into develop
* p/ticket/9983:
[ticket/9983] Also check generic APC enable/disable.
[ticket/9983] Use APC instead of apc in error messages.
[ticket/9983] Skip tests if APC is not enabled for CLI.
[ticket/9983] Test for apc cache driver.
[ticket/9983] Add phpbb prefix to global variables.
[ticket/9983] Empty line by request.
[ticket/9983] Indeed, it is <?php.
[ticket/9983] Add a test for destroy.
[ticket/9983] Exercise exists also.
[ticket/9983] Add a purge test.
[ticket/9983] Rename test methods.
[ticket/9983] get/put cache test moved to a base class.
[ticket/9983] Create driver in setup in null driver test.
[ticket/9983] Split cache test into per-driver files.
[ticket/9983] Add redis cache driver tests.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/cache/driver/redis.php | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/phpBB/includes/cache/driver/redis.php b/phpBB/includes/cache/driver/redis.php index d256b5600e..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')) { |