Merge up trunk

[awesomized/libmemcached] / libtest / memcached.cc

diff --git a/libtest/memcached.cc b/libtest/memcached.cc
index e3d90947a2c0e1b99a5395dbb94f0942d27122f4..e7112ed61d35203d8dd78ce782e9f53f282262cc 100644 (file)
--- a/libtest/memcached.cc
+++ b/libtest/memcached.cc
@@ -77,29 +77,30 @@ public:
     {
       Wait wait(pid_file(), 0);
 
-      if (not wait.successful())
+      if (error_is_ok and not wait.successful())
       {
         Error << "Pidfile was not found:" << pid_file();
         return -1;
       }
     }
 
+    pid_t local_pid;
     memcached_return_t rc;
     if (has_socket())
     {
-      _pid= libmemcached_util_getpid(socket().c_str(), port(), &rc);
+      local_pid= libmemcached_util_getpid(socket().c_str(), port(), &rc);
     }
     else
     {
-      _pid= libmemcached_util_getpid(hostname().c_str(), port(), &rc);
+      local_pid= libmemcached_util_getpid(hostname().c_str(), port(), &rc);
     }
 
-    if ((memcached_failed(rc) or _pid < 1) and not error_is_ok)
+    if (error_is_ok and ((memcached_failed(rc) or local_pid < 1)))
     {
-      Error << "libmemcached_util_getpid(" << memcached_strerror(NULL, rc) << ") pid: " << _pid << " for:" << *this;
+      Error << "libmemcached_util_getpid(" << memcached_strerror(NULL, rc) << ") pid: " << local_pid << " for:" << *this;
     }
 
-    return _pid;
+    return local_pid;
   }
 
   bool ping()
@@ -195,6 +196,8 @@ bool Memcached::build(int argc, const char *argv[])
     arg_buffer << " -u root ";
   }
 
+  arg_buffer << " -l 127.0.0.1 ";
+
   for (int x= 1 ; x < argc ; x++)
   {
     arg_buffer << " " << argv[x] << " ";