Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-115

[m6w6/libmemcached] / libtest / gearmand.cc

diff --git a/libtest/gearmand.cc b/libtest/gearmand.cc
index f6dbdfce70ff23178b330c854649db695d75c9d3..41a73d3c38bd96cffcfd1587c04e7905813f02f7 100644 (file)
--- a/libtest/gearmand.cc
+++ b/libtest/gearmand.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <libtest/gearmand.h>
@@ -57,8 +57,6 @@ using namespace libtest;
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <libgearman/gearman.h>
-
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
@@ -73,37 +71,15 @@ public:
 
   bool ping()
   {
-    gearman_client_st *client= gearman_client_create(NULL);
-    if (client == NULL)
+    if (out_of_ban_killed())
     {
-      Error << "Could not allocate memory for gearman_client_create()";
       return false;
     }
-    gearman_client_set_timeout(client, 3000);
-
-    if (gearman_success(gearman_client_add_server(client, hostname().c_str(), port())))
-    {
-      gearman_return_t rc= gearman_client_echo(client, test_literal_param("This is my echo test"));
-
-      if (gearman_success(rc))
-      {
-        gearman_client_free(client);
-        return true;
-      }
-      
-      if (out_of_ban_killed() == false)
-      {
-        Error << hostname().c_str() << ":" << port() << " " << gearman_client_error(client);
-      }
-    }
-    else
-    {
-      Error << "gearman_client_add_server() " << gearman_client_error(client);
-    }
 
-    gearman_client_free(client);
+    SimpleClient client(_hostname, _port);
 
-    return false;;
+    std::string response;
+    return client.send_message("version", response);
   }
 
   const char *name()