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

[awesomized/libmemcached] / libmemcachedutil / ping.cc

diff --git a/libmemcachedutil/ping.cc b/libmemcachedutil/ping.cc
index 82d891a9e090bbb6705cbda7192090731fd38159..e2831beb89f1bd134c06120aad49f26e9166da8b 100644 (file)
--- a/libmemcachedutil/ping.cc
+++ b/libmemcachedutil/ping.cc
@@ -42,38 +42,43 @@
 bool libmemcached_util_ping(const char *hostname, in_port_t port, memcached_return_t *ret)
 {
   memcached_return_t unused;
-  if (not ret)
+  if (ret == NULL)
+  {
     ret= &unused;
+  }
 
   memcached_st *memc_ptr= memcached_create(NULL);
-  if (not memc_ptr)
+  if (memc_ptr == NULL)
   {
     *ret= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
     return false;
   }
 
-  memcached_return_t rc= memcached_server_add(memc_ptr, hostname, port);
-  if (memcached_success(rc))
-  {
-    rc= memcached_version(memc_ptr);
-  }
-
-  if (memcached_failed(rc) and rc == MEMCACHED_SOME_ERRORS)
+  if (memcached_success((*ret= memcached_behavior_set(memc_ptr, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, 400000))))
   {
-    memcached_server_instance_st instance=
-      memcached_server_instance_by_position(memc_ptr, 0);
+    memcached_return_t rc= memcached_server_add(memc_ptr, hostname, port);
+    if (memcached_success(rc))
+    {
+      rc= memcached_version(memc_ptr);
+    }
 
-    assert_msg(instance and instance->error_messages, " ");
-    if (instance and instance->error_messages)
+    if (memcached_failed(rc) and rc == MEMCACHED_SOME_ERRORS)
     {
-      rc= memcached_server_error_return(instance);
+      memcached_server_instance_st instance=
+        memcached_server_instance_by_position(memc_ptr, 0);
+
+      assert_msg(instance and memcached_server_error(instance), " ");
+      if (instance and memcached_server_error(instance))
+      {
+        rc= memcached_server_error_return(instance);
+      }
     }
+
+    *ret= rc;
   }
   memcached_free(memc_ptr);
 
-  *ret= rc;
-
-  return memcached_success(rc);
+  return memcached_success(*ret);
 }
 
 bool libmemcached_util_ping2(const char *hostname, in_port_t port, const char *username, const char *password,  memcached_return_t *ret)
@@ -117,8 +122,8 @@ bool libmemcached_util_ping2(const char *hostname, in_port_t port, const char *u
     memcached_server_instance_st instance=
       memcached_server_instance_by_position(memc_ptr, 0);
 
-    assert_msg(instance and instance->error_messages, " ");
-    if (instance and instance->error_messages)
+    assert_msg(instance and memcached_server_error(instance), " ");
+    if (instance and memcached_server_error(instance))
     {
       rc= memcached_server_error_return(instance);
     }