Merge lp:~brianaker/gearmand/redis-fix into lp:gearmand

Proposed by Brian Aker on 2013-06-27
Status: Merged
Merged at revision: 786
Proposed branch: lp:~brianaker/gearmand/redis-fix
Merge into: lp:gearmand
Diff against target: 21 lines (+2/-2)
1 file modified
libgearman-server/plugins/queue/redis/queue.cc (+2/-2)
To merge this branch: bzr merge lp:~brianaker/gearmand/redis-fix
Reviewer Review Type Date Requested Status
Tangent Trunk 2013-06-27 Pending
Review via email: mp+171703@code.launchpad.net

Description of the change

Merge

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libgearman-server/plugins/queue/redis/queue.cc'
2--- libgearman-server/plugins/queue/redis/queue.cc 2013-06-11 18:52:42 +0000
3+++ libgearman-server/plugins/queue/redis/queue.cc 2013-06-27 02:00:34 +0000
4@@ -100,7 +100,7 @@
5
6 Hiredis::Hiredis() :
7 Queue("redis"),
8- server("127.0.0.1"),
9+ server("localhost"),
10 service("6379"),
11 _redis(NULL)
12 {
13@@ -116,7 +116,7 @@
14 gearmand_error_t Hiredis::initialize()
15 {
16 int service_port= atoi(service.c_str());
17- if ((_redis= redisConnect("127.0.0.1", service_port)) == NULL)
18+ if ((_redis= redisConnect(server.c_str(), service_port)) == NULL)
19 {
20 return gearmand_gerror("Could not connect to redis server", GEARMAND_QUEUE_ERROR);
21 }

Subscribers

People subscribed via source and target branches

to all changes: