Update framework.

[m6w6/libmemcached] / libtest / gearmand.cc

diff --git a/libtest/gearmand.cc b/libtest/gearmand.cc
index 1cb52079c6c95f612a10d053fcf9e30426d76861..7a33b4df058d383984b8af4f211ded631b635b40 100644 (file)
--- a/libtest/gearmand.cc
+++ b/libtest/gearmand.cc
@@ -49,40 +49,6 @@ using namespace libtest;
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
 
-class GetPid : public util::Instance::Finish
-{
-private:
-  pid_t _pid;
-
-public:
-  GetPid() :
-    _pid(-1)
-  { }
-
-  pid_t pid()
-  {
-    return _pid;
-  }
-
-
-  bool call(const bool success, const std::string &response)
-  {
-    _pid= -1;
-    if (success and response.size())
-    {
-      _pid= atoi(response.c_str());
-    }
-
-    if (is_pid_valid(_pid) == false)
-    {
-      _pid= -1;
-      return false;
-    }
-
-    return true;
-  }
-};
-
 using namespace libtest;
 
 class Gearmand : public libtest::Server
@@ -95,33 +61,6 @@ public:
     set_pid_file();
   }
 
-  pid_t get_pid(bool error_is_ok)
-  {
-    if (pid_file().empty() == false)
-    {
-      Wait wait(pid_file(), 0);
-
-      if (error_is_ok and not wait.successful())
-      {
-        Error << "Pidfile was not found:" << pid_file();
-        return -1;
-      }
-    }
-
-    GetPid *get_instance_pid;
-    util::Instance instance(hostname(), port());
-    instance.set_finish(get_instance_pid= new GetPid);
-
-    instance.push(new util::Operation(test_literal_param("getpid\r\n"), true));
-
-    if (error_is_ok and instance.run() == false)
-    {
-      Error << "Failed to obtain pid of server";
-    }
-
-    return get_instance_pid->pid();
-  }
-
   bool ping()
   {
     gearman_client_st *client= gearman_client_create(NULL);
@@ -183,7 +122,7 @@ public:
 
   bool has_syslog() const
   {
-    return true;
+    return false; //  --syslog.errmsg-enable
   }
 
   bool has_port_option() const
@@ -196,8 +135,6 @@ public:
 
 bool Gearmand::build(size_t argc, const char *argv[])
 {
-  std::stringstream arg_buffer;
-
   if (getuid() == 0 or geteuid() == 0)
   {
     add_option("-u", "root");