X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fmemcached.cc;h=daf6787cf69b9c86bd2afaaefe2b58772c2b47d8;hb=9428b4c34783838b84181abb0a5335ccd9db72ed;hp=ceb2d878cca9e36a50fb3c1f18f90e80bccd14e1;hpb=58c279d58e2a44562f729e93e301dfedf42f530b;p=awesomized%2Flibmemcached

diff --git a/libtest/memcached.cc b/libtest/memcached.cc
index ceb2d878..daf6787c 100644
--- a/libtest/memcached.cc
+++ b/libtest/memcached.cc
@@ -87,9 +87,7 @@ public:
     // Memcached is slow to start, so we need to do this
     if (not pid_file().empty())
     {
-      Wait wait(pid_file(), 0);
-
-      if (error_is_ok and not wait.successful())
+      if (error_is_ok and not wait_for_pidfile())
       {
         Error << "Pidfile was not found:" << pid_file();
         return -1;
@@ -97,7 +95,7 @@ public:
     }
 
     pid_t local_pid;
-    memcached_return_t rc;
+    memcached_return_t rc= MEMCACHED_SUCCESS;
     if (has_socket())
     {
       local_pid= libmemcached_util_getpid(socket().c_str(), 0, &rc);
@@ -120,9 +118,7 @@ public:
     // Memcached is slow to start, so we need to do this
     if (not pid_file().empty())
     {
-      Wait wait(pid_file(), 0);
-
-      if (not wait.successful())
+      if (not wait_for_pidfile())
       {
         Error << "Pidfile was not found:" << pid_file();
         return -1;
@@ -230,9 +226,7 @@ public:
     // Memcached is slow to start, so we need to do this
     if (not pid_file().empty())
     {
-      Wait wait(pid_file(), 0);
-
-      if (error_is_ok and not wait.successful())
+      if (error_is_ok and not wait_for_pidfile())
       {
         Error << "Pidfile was not found:" << pid_file();
         return -1;
@@ -263,9 +257,7 @@ public:
     // Memcached is slow to start, so we need to do this
     if (not pid_file().empty())
     {
-      Wait wait(pid_file(), 0);
-
-      if (not wait.successful())
+      if (not wait_for_pidfile())
       {
         Error << "Pidfile was not found:" << pid_file();
         return -1;