diff options
| author | Mike <MikeToString@gmail.com> | 2013-06-27 08:58:56 +0400 |
|---|---|---|
| committer | michael-grunder <michael.grunder@gmail.com> | 2014-02-23 23:50:34 +0400 |
| commit | 6f5e47cec331a2997e35d0226c07be0035aa647e (patch) | |
| tree | 5d53a76399e3734636bca4a88370dd2ac9a6eb14 /redis_array.c | |
| parent | 2e2a84a99e08a04ddb77f5d06d7825291247e96c (diff) | |
add support for 'connect_timeout' option for redis arrays
Conflicts:
redis_array.c
redis_array_impl.c
redis_array_impl.h
Diffstat (limited to 'redis_array.c')
| -rw-r--r-- | redis_array.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/redis_array.c b/redis_array.c index 2c431424..8576b9da 100644 --- a/redis_array.c +++ b/redis_array.c @@ -196,8 +196,9 @@ PHP_METHOD(RedisArray, __construct) RedisArray *ra = NULL; zend_bool b_index = 0, b_autorehash = 0, b_pconnect = 0; HashTable *hPrev = NULL, *hOpts = NULL; - long l_retry_interval = 0; + long l_retry_interval = 0; zend_bool b_lazy_connect = 0; + double d_connect_timeout = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|a", &z0, &z_opts) == FAILURE) { RETURN_FALSE; @@ -261,6 +262,19 @@ PHP_METHOD(RedisArray, __construct) if(FAILURE != zend_hash_find(hOpts, "lazy_connect", sizeof("lazy_connect"), (void**)&zpData) && Z_TYPE_PP(zpData) == IS_BOOL) { b_lazy_connect = Z_BVAL_PP(zpData); } + + /* extract connect_timeout option */ + zval **z_connect_timeout_pp; + if (FAILURE != zend_hash_find(hOpts, "connect_timeout", sizeof("connect_timeout"), (void**)&z_connect_timeout_pp)) { + if (Z_TYPE_PP(z_connect_timeout_pp) == IS_DOUBLE || Z_TYPE_PP(z_connect_timeout_pp) == IS_STRING) { + if (Z_TYPE_PP(z_connect_timeout_pp) == IS_DOUBLE) { + d_connect_timeout = Z_DVAL_PP(z_connect_timeout_pp); + } + else { + d_connect_timeout = atof(Z_STRVAL_PP(z_connect_timeout_pp)); + } + } + } } /* extract either name of list of hosts from z0 */ @@ -270,7 +284,7 @@ PHP_METHOD(RedisArray, __construct) break; case IS_ARRAY: - ra = ra_make_array(Z_ARRVAL_P(z0), z_fun, z_dist, hPrev, b_index, b_pconnect, l_retry_interval, b_lazy_connect TSRMLS_CC); + ra = ra_make_array(Z_ARRVAL_P(z0), z_fun, z_dist, hPrev, b_index, b_pconnect, l_retry_interval, b_lazy_connect, d_connect_timeout TSRMLS_CC); break; default: @@ -280,6 +294,7 @@ PHP_METHOD(RedisArray, __construct) if(ra) { ra->auto_rehash = b_autorehash; + ra->connect_timeout = d_connect_timeout; #if PHP_VERSION_ID >= 50400 id = zend_list_insert(ra, le_redis_array TSRMLS_CC); #else |