Update all config.h usage.

[m6w6/libmemcached] / libtest / memcached.cc

diff --git a/libtest/memcached.cc b/libtest/memcached.cc
index adf650f8c770df28b23dc73612af957f31437c70..7d7920751c9bf8b66508d630a7a8c9d2f45e2cdf 100644 (file)
--- a/libtest/memcached.cc
+++ b/libtest/memcached.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <libmemcached-1.0/memcached.h>
@@ -124,36 +124,15 @@ public:
 
   bool ping()
   {
-#if 0
-    // Memcached is slow to start, so we need to do this
-    if (pid_file().empty() == false)
-    {
-      if (wait_for_pidfile() == false)
-      {
-        Error << "Pidfile was not found:" << pid_file() << " :" << running();
-        return -1;
-      }
-    }
-#endif
-
-    memcached_return_t rc;
-    bool ret;
-
-    if (has_socket())
-    {
-      ret= libmemcached_util_ping(socket().c_str(), 0, &rc);
-    }
-    else
+    if (out_of_ban_killed())
     {
-      ret= libmemcached_util_ping(hostname().c_str(), port(), &rc);
+      return false;
     }
 
-    if (memcached_failed(rc) or ret == false)
-    {
-      Error << "libmemcached_util_ping(" << hostname() << ", " << port() << ") error: " << memcached_strerror(NULL, rc);
-    }
+    SimpleClient client(_hostname, _port);
 
-    return ret;
+    std::string response;
+    return client.send_message("version", response);
   }
 
   const char *name()
@@ -332,16 +311,6 @@ public:
 
   bool ping()
   {
-    // Memcached is slow to start, so we need to do this
-    if (pid_file().empty() == false)
-    {
-      if (wait_for_pidfile() == false)
-      {
-        Error << "Pidfile was not found:" << pid_file();
-        return -1;
-      }
-    }
-
     memcached_return_t rc;
     bool ret;
 
@@ -356,7 +325,7 @@ public:
 
     if (memcached_failed(rc) or ret == false)
     {
-      Error << "libmemcached_util_ping2(" << hostname() << ", " << port() << ", " << username() << ", " << password() << ") error: " << memcached_strerror(NULL, rc);
+      error(memcached_strerror(NULL, rc));
     }
 
     return ret;
@@ -385,7 +354,7 @@ bool Memcached::build(size_t argc, const char *argv[])
     add_option(sasl());
   }
 
-  for (int x= 0 ; x < argc ; x++)
+  for (size_t x= 0 ; x < argc ; x++)
   {
     add_option(argv[x]);
   }