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

[Brian Aker]

[lp:~brianaker/gearmand/laptop-patches]

779. By Tangent.Org Continuous Integration on 2013-06-21

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

780. By Tangent.Org Continuous Integration on 2013-06-21

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

781. By Tangent.Org Continuous Integration on 2013-06-21

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

782. By Tangent.Org Continuous Integration on 2013-06-21

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

783. By Tangent.Org Continuous Integration on 2013-06-21

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

784. By Brian Aker on 2013-06-21

Update...

=== 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 @@
 
 Hiredis::Hiredis() :
   Queue("redis"),
-  server("127.0.0.1"),
+  server("localhost"),
   service("6379"),
   _redis(NULL)
 {
@@ -116,7 +116,7 @@
 gearmand_error_t Hiredis::initialize()
 {
   int service_port= atoi(service.c_str());
-  if ((_redis= redisConnect("127.0.0.1", service_port)) == NULL)
+  if ((_redis= redisConnect(server.c_str(), service_port)) == NULL)
   {
     return gearmand_gerror("Could not connect to redis server", GEARMAND_QUEUE_ERROR);
   }

=== 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 @@
       {
         return gearmand_gerror("_server_queue_work_data", ret);
       }
+
+      /* Remove from persistent queue if one exists. */
+      if (server_job->job_queued)
+      {
+        ret= gearman_queue_done(Server,
+                                server_job->unique,
+                                server_job->unique_length,
+                                server_job->function->function_name,
+                                server_job->function->function_name_size);
+        if (gearmand_failed(ret))
+        {
+          gearmand_gerror("Remove from persistent queue", ret);
+          return ret;
+        }
+      }
+
+      /* Job is done, remove it. */
+      gearman_server_job_free(server_job);
     }
 
     break;

=== 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 @@
   { }
   else if (task->recv->command == GEARMAN_COMMAND_WORK_WARNING)
   { }
-  else // GEARMAN_COMMAND_WORK_COMPLETE or GEARMAN_COMMAND_WORK_EXCEPTION
+  else // GEARMAN_COMMAND_WORK_COMPLETE, GEARMAN_COMMAND_WORK_EXCEPTION
   {
     return GEARMAN_SUCCESS;
   }

=== 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 @@
     {
       task->options.is_known= false;
       task->options.is_running= false;
+
       if (task->recv->argc == 1 and task->recv->data_size)
       {
         task->exception.store((const char*)(task->recv->data), task->recv->data_size);

=== 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 @@
   } while (gearman_continue(ret));
   ASSERT_EQ(ret, GEARMAN_SUCCESS);
 
-  test_truth(exception_success);
+  ASSERT_TRUE(gearman_task_has_exception(task));
+  ASSERT_TRUE(exception_success);
 
   gearman_client_set_exception_fn(client, NULL);
 

=== 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 @@
 
   gearman_string_t exception= gearman_task_exception(task);
   ASSERT_EQ(gearman_task_return(task), GEARMAN_WORK_EXCEPTION);
+  ASSERT_TRUE(gearman_task_has_exception(task));
   ASSERT_STREQ("dog", gearman_c_str(exception));
 
   return TEST_SUCCESS;