X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fmemcached.cc;h=9c237fdddfed9670146510b4bb4c76935ada3b7a;hb=24ac12fa9cebb786966f5907d594c9506d19c29f;hp=6f81dd6c790b696974ab087ad9cb16f4d93ae526;hpb=9dc6d5dd46302302b8683ed88908d7e6a86a3acf;p=m6w6%2Flibmemcached diff --git a/libtest/memcached.cc b/libtest/memcached.cc index 6f81dd6c..9c237fdd 100644 --- a/libtest/memcached.cc +++ b/libtest/memcached.cc @@ -20,6 +20,7 @@ */ +#include #include #include @@ -49,20 +50,38 @@ using namespace libtest; using namespace libtest; +namespace { + bool is_memcached_libtool() + { + if (MEMCACHED_BINARY and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0) + { + return true; + } + + return false; + } +} + class Memcached : public libtest::Server { std::string _username; std::string _password; public: - Memcached(const std::string& host_arg, const in_port_t port_arg, const bool is_socket_arg, const std::string& username_arg, const std::string& password_arg) : - libtest::Server(host_arg, port_arg, is_socket_arg), + Memcached(const std::string& host_arg, + const in_port_t port_arg, + const bool is_socket_arg, + const std::string& username_arg, + const std::string& password_arg) : + libtest::Server(host_arg, port_arg, + MEMCACHED_BINARY, is_memcached_libtool(), is_socket_arg), _username(username_arg), _password(password_arg) { } Memcached(const std::string& host_arg, const in_port_t port_arg, const bool is_socket_arg) : - libtest::Server(host_arg, port_arg, is_socket_arg) + libtest::Server(host_arg, port_arg, + MEMCACHED_BINARY, is_memcached_libtool(), is_socket_arg) { set_pid_file(); } @@ -82,16 +101,21 @@ public: return _username; } + bool wait_for_pidfile() const + { + Wait wait(pid(), 4); + + return wait.successful(); + } + pid_t get_pid(bool error_is_ok) { // Memcached is slow to start, so we need to do this - if (pid_file().empty() == false) + if (error_is_ok and + wait_for_pidfile() == false) { - if (error_is_ok and not wait_for_pidfile()) - { - Error << "Pidfile was not found:" << pid_file(); - return -1; - } + Error << "Pidfile was not found:" << pid_file(); + return -1; } pid_t local_pid; @@ -120,22 +144,24 @@ public: bool ping() { +#if 0 // Memcached is slow to start, so we need to do this - if (not pid_file().empty()) + if (pid_file().empty() == false) { - if (not wait_for_pidfile()) + if (wait_for_pidfile() == false) { - Error << "Pidfile was not found:" << pid_file(); + Error << "Pidfile was not found:" << pid_file() << " :" << running(); return -1; } } +#endif memcached_return_t rc; bool ret; if (has_socket()) { - ret= libmemcached_util_ping(socket().c_str(), 0, &rc); + ret= libmemcached_util_ping(socket().c_str(), 0, &rc); } else { @@ -160,6 +186,11 @@ public: return MEMCACHED_BINARY; } + bool is_libtool() + { + return is_memcached_libtool(); + } + virtual void pid_file_option(Application& app, const std::string& arg) { if (arg.empty() == false) @@ -173,11 +204,6 @@ public: return "-s "; } - const char *daemon_file_option() - { - return "-d"; - } - virtual void port_option(Application& app, in_port_t arg) { char buffer[30]; @@ -203,11 +229,6 @@ public: } } - bool is_libtool() - { - return false; - } - bool broken_socket_cleanup() { return true; @@ -226,8 +247,8 @@ class MemcachedLight : public libtest::Server { public: - MemcachedLight(const std::string& host_arg, const in_port_t port_arg): - libtest::Server(host_arg, port_arg) + MemcachedLight(const std::string& host_arg, const in_port_t port_arg) : + libtest::Server(host_arg, port_arg, MEMCACHED_LIGHT_BINARY, true) { set_pid_file(); } @@ -235,9 +256,9 @@ public: pid_t get_pid(bool error_is_ok) { // Memcached is slow to start, so we need to do this - if (not pid_file().empty()) + if (pid_file().empty() == false) { - if (error_is_ok and not wait_for_pidfile()) + if (error_is_ok and wait_for_pidfile() == false) { Error << "Pidfile was not found:" << pid_file(); return -1; @@ -298,11 +319,6 @@ public: return MEMCACHED_LIGHT_BINARY; } - const char *daemon_file_option() - { - return "--daemon"; - } - virtual void port_option(Application& app, in_port_t arg) { char buffer[1024]; @@ -320,13 +336,33 @@ public: return true; } + void log_file_option(Application& app, const std::string& arg) + { + if (arg.empty() == false) + { + std::string buffer("--log-file="); + buffer+= arg; + app.add_option("--verbose"); + app.add_option(buffer); + } + } + + bool has_log_file_option() const + { + return true; + } + bool build(size_t argc, const char *argv[]); }; class MemcachedSaSL : public Memcached { public: - MemcachedSaSL(const std::string& host_arg, const in_port_t port_arg, const bool is_socket_arg, const std::string& username_arg, const std::string &password_arg) : + MemcachedSaSL(const std::string& host_arg, + const in_port_t port_arg, + const bool is_socket_arg, + const std::string& username_arg, + const std::string &password_arg) : Memcached(host_arg, port_arg, is_socket_arg, username_arg, password_arg) { } @@ -348,9 +384,10 @@ public: pid_t get_pid(bool error_is_ok) { // Memcached is slow to start, so we need to do this - if (not pid_file().empty()) + if (pid_file().empty() == false) { - if (error_is_ok and not wait_for_pidfile()) + if (error_is_ok and + wait_for_pidfile() == false) { Error << "Pidfile was not found:" << pid_file(); return -1; @@ -379,9 +416,9 @@ public: bool ping() { // Memcached is slow to start, so we need to do this - if (not pid_file().empty()) + if (pid_file().empty() == false) { - if (not wait_for_pidfile()) + if (wait_for_pidfile() == false) { Error << "Pidfile was not found:" << pid_file(); return -1; @@ -400,7 +437,7 @@ public: ret= libmemcached_util_ping2(hostname().c_str(), port(), username().c_str(), password().c_str(), &rc); } - if (memcached_failed(rc) or not ret) + if (memcached_failed(rc) or ret == false) { Error << "libmemcached_util_ping2(" << hostname() << ", " << port() << ", " << username() << ", " << password() << ") error: " << memcached_strerror(NULL, rc); } @@ -441,7 +478,7 @@ bool Memcached::build(size_t argc, const char *argv[]) bool MemcachedLight::build(size_t argc, const char *argv[]) { - for (int x= 0 ; x < argc ; x++) + for (size_t x= 0 ; x < argc ; x++) { add_option(argv[x]); }