X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fgearmand.cc;h=177de120a1bb74bea1806c7b6a88b29fe1a49796;hb=35b7e1ac4af1f81704affd6fa94cac09603fdb35;hp=bcb7f8aaba2d7bcd7d033d4bf534b14b5ece03d2;hpb=751e342e158ae65052ce098ccd64aa54e39312db;p=awesomized%2Flibmemcached

diff --git a/libtest/gearmand.cc b/libtest/gearmand.cc
index bcb7f8aa..177de120 100644
--- a/libtest/gearmand.cc
+++ b/libtest/gearmand.cc
@@ -20,6 +20,7 @@
  */
 
 
+#include <config.h>
 #include <libtest/common.h>
 
 #include <libtest/gearmand.h>
@@ -89,38 +90,11 @@ class Gearmand : public libtest::Server
 private:
 public:
   Gearmand(const std::string& host_arg, in_port_t port_arg) :
-    libtest::Server(host_arg, port_arg)
+    libtest::Server(host_arg, port_arg, GEARMAND_BINARY, true)
   {
     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);
@@ -159,62 +133,56 @@ public:
     return "gearmand";
   };
 
-  const char *executable()
+  void log_file_option(Application& app, const std::string& arg)
   {
-    return GEARMAND_BINARY;
-  }
-
-  const char *pid_file_option()
-  {
-    return "--pid-file=";
-  }
-
-  const char *daemon_file_option()
-  {
-    return "--daemon";
+    if (arg.empty() == false)
+    {
+      std::string buffer("--log-file=");
+      buffer+= arg;
+      app.add_option("--verbose=DEBUG");
+      app.add_option(buffer);
+    }
   }
 
-  const char *log_file_option()
+  bool has_log_file_option() const
   {
-    return "--verbose=DEBUG --log-file=";
+    return true;
   }
 
-  const char *port_option()
+  bool is_libtool()
   {
-    return "--port=";
+    return true;
   }
 
-  bool is_libtool()
+  bool has_syslog() const
   {
     return true;
   }
 
-  bool has_syslog() const
+  bool has_port_option() const
   {
     return true;
   }
 
-  bool build(int argc, const char *argv[]);
+  bool build(size_t argc, const char *argv[]);
 };
 
-bool Gearmand::build(int argc, const char *argv[])
+bool Gearmand::build(size_t argc, const char *argv[])
 {
   std::stringstream arg_buffer;
 
   if (getuid() == 0 or geteuid() == 0)
   {
-    arg_buffer << " -u root ";
+    add_option("-u", "root");
   }
 
-  arg_buffer << " --listen=localhost ";
+  add_option("--listen=localhost");
 
-  for (int x= 1 ; x < argc ; x++)
+  for (size_t x= 0 ; x < argc ; x++)
   {
-    arg_buffer << " " << argv[x] << " ";
+    add_option(argv[x]);
   }
 
-  set_extra_args(arg_buffer.str());
-
   return true;
 }