X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fmemcached.cc;h=7d25153fb078c783734bdaa314ce4862f1f51b70;hb=70d0d339d06cbe6b35ef0efc4fd3d7e8f92b6a01;hp=daf6787cf69b9c86bd2afaaefe2b58772c2b47d8;hpb=45bd4941b48480653534255cee795684ed230084;p=awesomized%2Flibmemcached

diff --git a/libtest/memcached.cc b/libtest/memcached.cc
index daf6787c..7d25153f 100644
--- a/libtest/memcached.cc
+++ b/libtest/memcached.cc
@@ -22,8 +22,8 @@
 
 #include <libtest/common.h>
 
-#include <libmemcached/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcached-1.0/memcached.h>
+#include <libmemcachedutil-1.0/util.h>
 
 using namespace libtest;
 
@@ -98,7 +98,12 @@ public:
     memcached_return_t rc= MEMCACHED_SUCCESS;
     if (has_socket())
     {
-      local_pid= libmemcached_util_getpid(socket().c_str(), 0, &rc);
+      if (socket().empty())
+      {
+        return -1;
+      }
+
+      local_pid= libmemcached_util_getpid(socket().c_str(), port(), &rc);
     }
     else
     {
@@ -298,7 +303,7 @@ bool Memcached::build(int argc, const char *argv[])
     arg_buffer << " -u root ";
   }
 
-  arg_buffer << " -l 127.0.0.1 ";
+  arg_buffer << " -l localhost ";
   arg_buffer << " -m 128 ";
   arg_buffer << " -M ";