Re-add UNIX socket support to RedisArray

michael-grunder · michael-grunder · commit 16185f2e37d4 · 2013-08-11T09:01:49.000-07:00
Merging the logic from ra-performance branch into feature/ra-performance
diff --git a/redis_array_impl.c b/redis_array_impl.c
@@ -36,7 +36,7 @@ ra_load_hosts(RedisArray *ra, HashTable *hosts, long retry_interval TSRMLS_DC)
 	int count = zend_hash_num_elements(hosts);
 	char *host, *p;
 	short port;
-	zval **zpData, z_cons, z_ret;
+	zval **zpData, *z_args, z_cons, z_ret;
 	RedisSock *redis_sock  = NULL;
 
 	/* function calls on the Redis object */
@@ -59,7 +59,9 @@ ra_load_hosts(RedisArray *ra, HashTable *hosts, long retry_interval TSRMLS_DC)
 		if((p = strchr(host, ':'))) { /* found port */
 			host_len = p - host;
 			port = (short)atoi(p+1);
-		}
+		} else if(strchr(host,'/') != NULL) { /* unix socket */
+            port = -1;
+        }
 
 		/* create Redis object */
 		MAKE_STD_ZVAL(ra->redis[i]);
@@ -68,7 +70,7 @@ ra_load_hosts(RedisArray *ra, HashTable *hosts, long retry_interval TSRMLS_DC)
 		call_user_function(&redis_ce->function_table, &ra->redis[i], &z_cons, &z_ret, 0, NULL TSRMLS_CC);
 
 		/* create socket */
-		redis_sock = redis_sock_create(host, host_len, port, 0, 0, NULL, retry_interval); /* TODO: persistence? */
+		redis_sock = redis_sock_create(host, host_len, port, 0, ra->pconnect, NULL, retry_interval);
 
 		/* connect */
 		redis_sock_server_open(redis_sock, 1 TSRMLS_CC);
