X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fgearmand.cc;h=f6dbdfce70ff23178b330c854649db695d75c9d3;hb=d0bcf33155307f66b7e5a35f7934735f83665945;hp=f526e015f4c0648690dd19c225bc8596029c96b4;hpb=4429c4e4315bfeb2bdfc59c3b39f8964f68524ef;p=awesomized%2Flibmemcached

diff --git a/libtest/gearmand.cc b/libtest/gearmand.cc
index f526e015..f6dbdfce 100644
--- a/libtest/gearmand.cc
+++ b/libtest/gearmand.cc
@@ -1,8 +1,8 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  libtest
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Data Differential YATL (i.e. libtest)  library
+ *
+ *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -34,7 +34,9 @@
  *
  */
 
+#include <config.h>
 #include <libtest/common.h>
+
 #include <libtest/gearmand.h>
 
 #include "util/instance.hpp"
@@ -50,6 +52,7 @@ using namespace libtest;
 #include <cstring>
 #include <iostream>
 #include <signal.h>
+#include <sstream>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -60,87 +63,23 @@ 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 (_pid < 1)
-    {
-      _pid= -1;
-      return false;
-    }
-
-    return true;
-  }
-};
-
 using namespace libtest;
 
-class Gearmand : public Server
+class Gearmand : public libtest::Server
 {
 private:
 public:
-  Gearmand(const std::string& host_arg, in_port_t port_arg) :
-    Server(host_arg, port_arg)
-  { }
-
-  pid_t get_pid(bool error_is_ok)
-  {
-    if (not pid_file().empty())
-    {
-      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();
-  }
+  Gearmand(const std::string& host_arg, in_port_t port_arg, const char* binary= GEARMAND_BINARY);
 
   bool ping()
   {
     gearman_client_st *client= gearman_client_create(NULL);
-    if (not client)
+    if (client == NULL)
     {
       Error << "Could not allocate memory for gearman_client_create()";
       return false;
     }
-    gearman_client_set_timeout(client, 1000);
+    gearman_client_set_timeout(client, 3000);
 
     if (gearman_success(gearman_client_add_server(client, hostname().c_str(), port())))
     {
@@ -151,6 +90,15 @@ public:
         gearman_client_free(client);
         return true;
       }
+      
+      if (out_of_ban_killed() == false)
+      {
+        Error << hostname().c_str() << ":" << port() << " " << gearman_client_error(client);
+      }
+    }
+    else
+    {
+      Error << "gearman_client_add_server() " << gearman_client_error(client);
     }
 
     gearman_client_free(client);
@@ -163,66 +111,73 @@ 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=";
+    if (arg.empty() == false)
+    {
+      std::string buffer("--log-file=");
+      buffer+= arg;
+      app.add_option("--verbose=DEBUG");
+      app.add_option(buffer);
+    }
   }
 
-  const char *daemon_file_option()
+  bool has_log_file_option() const
   {
-    return "--daemon";
+    return true;
   }
 
-  const char *log_file_option()
+  bool is_libtool()
   {
-    return "-vvvvv --log-file=";
+    return true;
   }
 
-  const char *port_option()
+  bool has_syslog() const
   {
-    return "--port=";
+    return false; //  --syslog.errmsg-enable
   }
 
-  bool is_libtool()
+  bool has_port_option() const
   {
     return true;
   }
 
-  bool build(int argc, const char *argv[]);
+  bool build(size_t argc, const char *argv[]);
 };
 
-
-#include <sstream>
-
-bool Gearmand::build(int argc, const char *argv[])
+Gearmand::Gearmand(const std::string& host_arg, in_port_t port_arg, const char* binary_arg) :
+  libtest::Server(host_arg, port_arg, binary_arg, true)
 {
-  std::stringstream arg_buffer;
+  set_pid_file();
+}
 
+bool Gearmand::build(size_t argc, const char *argv[])
+{
   if (getuid() == 0 or geteuid() == 0)
   {
-    arg_buffer << " -u root ";
+    add_option("-u", "root");
   }
 
-  for (int x= 1 ; x < argc ; x++)
+  add_option("--listen=localhost");
+
+  for (size_t x= 0 ; x < argc ; x++)
   {
-    arg_buffer << " " << argv[x] << " ";
+    add_option(argv[x]);
   }
 
-  set_extra_args(arg_buffer.str());
-
   return true;
 }
 
 namespace libtest {
 
-Server *build_gearmand(const char *hostname, in_port_t try_port)
+libtest::Server *build_gearmand(const char *hostname, in_port_t try_port)
 {
   return new Gearmand(hostname, try_port);
 }
 
+libtest::Server *build_gearmand(const char *hostname, in_port_t try_port, const char* binary)
+{
+  return new Gearmand(hostname, try_port, binary);
+}
+
 }