Merge lp:~brianaker/gearmand/laptop-patches into lp:gearmand

Proposed by Brian Aker
Status: Merged
Merged at revision: 789
Proposed branch: lp:~brianaker/gearmand/laptop-patches
Merge into: lp:gearmand
Diff against target: 101 lines (+25/-4)
6 files modified
libgearman-server/plugins/queue/redis/queue.cc (+2/-2)
libgearman-server/server.cc (+18/-0)
libgearman/actions.cc (+1/-1)
libgearman/run.cc (+1/-0)
tests/libgearman-1.0/task.cc (+2/-1)
tests/libgearman-1.0/worker_test.cc (+1/-0)
To merge this branch: bzr merge lp:~brianaker/gearmand/laptop-patches
Reviewer Review Type Date Requested Status
Tangent Trunk Pending
Review via email: mp+169666@code.launchpad.net
To post a comment you must log in.
779. By Tangent.Org Continuous Integration

Merge lp:~brianaker/gearmand/update-bootstrap-june Build: jenkins-Gearmand-653

780. By Tangent.Org Continuous Integration

Merge lp:~brianaker/gearmand/update-bootstrap-june Build: jenkins-Gearmand-655

781. By Tangent.Org Continuous Integration

Merge lp:~brianaker/gearmand/update-bootstrap-june Build: jenkins-Gearmand-656

782. By Tangent.Org Continuous Integration

Merge lp:~brianaker/gearmand/m4-updates-june Build: jenkins-Gearmand-657

783. By Tangent.Org Continuous Integration

Merge lp:~brianaker/gearmand/fix_segfault Build: jenkins-Gearmand-658

784. By Brian Aker

Update...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libgearman-server/plugins/queue/redis/queue.cc'
--- libgearman-server/plugins/queue/redis/queue.cc 2013-06-11 18:52:42 +0000
+++ libgearman-server/plugins/queue/redis/queue.cc 2013-06-21 19:13:29 +0000
@@ -100,7 +100,7 @@
100100
101Hiredis::Hiredis() :101Hiredis::Hiredis() :
102 Queue("redis"),102 Queue("redis"),
103 server("127.0.0.1"),103 server("localhost"),
104 service("6379"),104 service("6379"),
105 _redis(NULL)105 _redis(NULL)
106{106{
@@ -116,7 +116,7 @@
116gearmand_error_t Hiredis::initialize()116gearmand_error_t Hiredis::initialize()
117{117{
118 int service_port= atoi(service.c_str());118 int service_port= atoi(service.c_str());
119 if ((_redis= redisConnect("127.0.0.1", service_port)) == NULL)119 if ((_redis= redisConnect(server.c_str(), service_port)) == NULL)
120 {120 {
121 return gearmand_gerror("Could not connect to redis server", GEARMAND_QUEUE_ERROR);121 return gearmand_gerror("Could not connect to redis server", GEARMAND_QUEUE_ERROR);
122 }122 }
123123
=== modified file 'libgearman-server/server.cc'
--- libgearman-server/server.cc 2013-06-15 08:40:14 +0000
+++ libgearman-server/server.cc 2013-06-21 19:13:29 +0000
@@ -827,6 +827,24 @@
827 {827 {
828 return gearmand_gerror("_server_queue_work_data", ret);828 return gearmand_gerror("_server_queue_work_data", ret);
829 }829 }
830
831 /* Remove from persistent queue if one exists. */
832 if (server_job->job_queued)
833 {
834 ret= gearman_queue_done(Server,
835 server_job->unique,
836 server_job->unique_length,
837 server_job->function->function_name,
838 server_job->function->function_name_size);
839 if (gearmand_failed(ret))
840 {
841 gearmand_gerror("Remove from persistent queue", ret);
842 return ret;
843 }
844 }
845
846 /* Job is done, remove it. */
847 gearman_server_job_free(server_job);
830 }848 }
831849
832 break;850 break;
833851
=== modified file 'libgearman/actions.cc'
--- libgearman/actions.cc 2013-06-15 08:54:59 +0000
+++ libgearman/actions.cc 2013-06-21 19:13:29 +0000
@@ -80,7 +80,7 @@
80 { }80 { }
81 else if (task->recv->command == GEARMAN_COMMAND_WORK_WARNING)81 else if (task->recv->command == GEARMAN_COMMAND_WORK_WARNING)
82 { }82 { }
83 else // GEARMAN_COMMAND_WORK_COMPLETE or GEARMAN_COMMAND_WORK_EXCEPTION83 else // GEARMAN_COMMAND_WORK_COMPLETE, GEARMAN_COMMAND_WORK_EXCEPTION
84 {84 {
85 return GEARMAN_SUCCESS;85 return GEARMAN_SUCCESS;
86 }86 }
8787
=== modified file 'libgearman/run.cc'
--- libgearman/run.cc 2013-06-15 09:04:34 +0000
+++ libgearman/run.cc 2013-06-21 19:13:29 +0000
@@ -356,6 +356,7 @@
356 {356 {
357 task->options.is_known= false;357 task->options.is_known= false;
358 task->options.is_running= false;358 task->options.is_running= false;
359
359 if (task->recv->argc == 1 and task->recv->data_size)360 if (task->recv->argc == 1 and task->recv->data_size)
360 {361 {
361 task->exception.store((const char*)(task->recv->data), task->recv->data_size);362 task->exception.store((const char*)(task->recv->data), task->recv->data_size);
362363
=== modified file 'tests/libgearman-1.0/task.cc'
--- tests/libgearman-1.0/task.cc 2013-03-15 21:54:07 +0000
+++ tests/libgearman-1.0/task.cc 2013-06-21 19:13:29 +0000
@@ -306,7 +306,8 @@
306 } while (gearman_continue(ret));306 } while (gearman_continue(ret));
307 ASSERT_EQ(ret, GEARMAN_SUCCESS);307 ASSERT_EQ(ret, GEARMAN_SUCCESS);
308308
309 test_truth(exception_success);309 ASSERT_TRUE(gearman_task_has_exception(task));
310 ASSERT_TRUE(exception_success);
310311
311 gearman_client_set_exception_fn(client, NULL);312 gearman_client_set_exception_fn(client, NULL);
312313
313314
=== modified file 'tests/libgearman-1.0/worker_test.cc'
--- tests/libgearman-1.0/worker_test.cc 2013-06-15 01:53:12 +0000
+++ tests/libgearman-1.0/worker_test.cc 2013-06-21 19:13:29 +0000
@@ -840,6 +840,7 @@
840840
841 gearman_string_t exception= gearman_task_exception(task);841 gearman_string_t exception= gearman_task_exception(task);
842 ASSERT_EQ(gearman_task_return(task), GEARMAN_WORK_EXCEPTION);842 ASSERT_EQ(gearman_task_return(task), GEARMAN_WORK_EXCEPTION);
843 ASSERT_TRUE(gearman_task_has_exception(task));
843 ASSERT_STREQ("dog", gearman_c_str(exception));844 ASSERT_STREQ("dog", gearman_c_str(exception));
844845
845 return TEST_SUCCESS;846 return TEST_SUCCESS;

Subscribers

People subscribed via source and target branches

to all changes: