From 6d3c9990a5314c3cc7203df3da8d855e8bc152d8 Mon Sep 17 00:00:00 2001 From: Emmanuel Merali Date: Tue, 29 Jan 2013 11:47:36 +0200 Subject: Merged changes from @mobli New select DB command to RedisArray - Added retry delay on reconnect Added the possibility to delay each reconnection attempt, including a random factor to prevent several or many concurrent connections from trying to reconnect at the same time. Added the select command to RedisArray to select a DB on every connections in one instruction. Also, fixed a compiler warning: redis_array_impl.c:1115:15: warning: incompatible pointer types assigning to 'zval **' (aka 'struct _zval_struct **') from 'zval **(*)[2]' [-Wincompatible-pointer-types] Conflicts: common.h --- redis_session.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'redis_session.c') diff --git a/redis_session.c b/redis_session.c index 95d90533..009bac51 100644 --- a/redis_session.c +++ b/redis_session.c @@ -206,6 +206,7 @@ PS_OPEN_FUNC(redis) int persistent = 0; int database = -1; char *prefix = NULL, *auth = NULL, *persistent_id = NULL; + long retry_interval = 0; /* translate unix: into file: */ if (!strncmp(save_path+i, "unix:", sizeof("unix:")-1)) { @@ -240,7 +241,6 @@ PS_OPEN_FUNC(redis) convert_to_long_ex(param); weight = Z_LVAL_PP(param); } - if (zend_hash_find(Z_ARRVAL_P(params), "timeout", sizeof("timeout"), (void **) ¶m) != FAILURE) { timeout = atof(Z_STRVAL_PP(param)); } @@ -260,13 +260,10 @@ PS_OPEN_FUNC(redis) convert_to_long_ex(param); database = Z_LVAL_PP(param); } - - /* // not supported yet if (zend_hash_find(Z_ARRVAL_P(params), "retry_interval", sizeof("retry_interval"), (void **) ¶m) != FAILURE) { convert_to_long_ex(param); retry_interval = Z_LVAL_PP(param); } - */ zval_ptr_dtor(¶ms); } @@ -280,9 +277,9 @@ PS_OPEN_FUNC(redis) RedisSock *redis_sock; if(url->host) { - redis_sock = redis_sock_create(url->host, strlen(url->host), url->port, timeout, persistent, persistent_id); + redis_sock = redis_sock_create(url->host, strlen(url->host), url->port, timeout, persistent, persistent_id, retry_interval); } else { /* unix */ - redis_sock = redis_sock_create(url->path, strlen(url->path), 0, timeout, persistent, persistent_id); + redis_sock = redis_sock_create(url->path, strlen(url->path), 0, timeout, persistent, persistent_id, retry_interval); } redis_pool_add(pool, redis_sock, weight, database, prefix, auth TSRMLS_CC); -- cgit v1.2.3 From 3e6d5b60d66e0a5b31080a7109c412b0ce6358e6 Mon Sep 17 00:00:00 2001 From: michael-grunder Date: Sun, 28 Apr 2013 11:09:58 -0700 Subject: Cutting a release for 2.2.3. Added myself as a maintainer in the header files --- redis_session.c | 1 + 1 file changed, 1 insertion(+) (limited to 'redis_session.c') diff --git a/redis_session.c b/redis_session.c index 009bac51..4e633fc9 100644 --- a/redis_session.c +++ b/redis_session.c @@ -16,6 +16,7 @@ | Original author: Alfonso Jimenez | | Maintainer: Nicolas Favre-Felix | | Maintainer: Nasreddine Bouafif | + | Maintainer: Michael Grunder | +----------------------------------------------------------------------+ */ -- cgit v1.2.3