X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fmemcached.cc;h=d2ce941ea54147a3cc1ea630f4c18bc5c4e91aae;hb=f006a1e25c398dd131668233b842b6be0b8200dd;hp=37a3102eab96b448fb3db10e7abbdc2d0c90d59f;hpb=fed85d3c429c3881cd378d10e4dccd30f4fd2478;p=m6w6%2Flibmemcached diff --git a/libtest/memcached.cc b/libtest/memcached.cc index 37a3102e..d2ce941e 100644 --- a/libtest/memcached.cc +++ b/libtest/memcached.cc @@ -34,14 +34,13 @@ * */ -#include +#include "mem_config.h" + #include #include #include -using namespace libtest; - #include #include #include @@ -62,19 +61,7 @@ using namespace libtest; #pragma GCC diagnostic ignored "-Wold-style-cast" #endif -using namespace libtest; - -namespace { - bool is_memcached_libtool() - { - if (MEMCACHED_BINARY and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0) - { - return true; - } - - return false; - } -} +namespace libtest { class Memcached : public libtest::Server { @@ -88,21 +75,21 @@ public: const std::string& username_arg, const std::string& password_arg) : libtest::Server(host_arg, port_arg, - MEMCACHED_BINARY, is_memcached_libtool(), is_socket_arg), + MEMCACHED_BINARY, false, 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, - MEMCACHED_BINARY, is_memcached_libtool(), is_socket_arg) + MEMCACHED_BINARY, false, is_socket_arg) { set_pid_file(); } virtual const char *sasl() const { - return NULL; + return "-S"; } const std::string& password() const @@ -124,36 +111,20 @@ public: bool ping() { -#if 0 - // Memcached is slow to start, so we need to do this - if (pid_file().empty() == false) + if (out_of_ban_killed()) { - if (wait_for_pidfile() == false) - { - Error << "Pidfile was not found:" << pid_file() << " :" << running(); - return -1; - } + return false; } -#endif - memcached_return_t rc; - bool ret; - - if (has_socket()) - { - ret= libmemcached_util_ping(socket().c_str(), 0, &rc); - } - else + if (is_socket()) { - ret= libmemcached_util_ping(hostname().c_str(), port(), &rc); + return _app.check(); } - if (memcached_failed(rc) or ret == false) - { - error(memcached_strerror(NULL, rc)); - } + SimpleClient client(_hostname, _port); - return ret; + std::string response; + return client.send_message("version", response); } const char *name() @@ -168,7 +139,7 @@ public: bool is_libtool() { - return is_memcached_libtool(); + return false; } virtual void pid_file_option(Application& app, const std::string& arg) @@ -223,137 +194,6 @@ public: bool build(size_t argc, const char *argv[]); }; -class MemcachedLight : public libtest::Server -{ - -public: - 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(); - } - - bool ping() - { - // Memcached is slow to start, so we need to do this - if (not pid_file().empty()) - { - if (not wait_for_pidfile()) - { - Error << "Pidfile was not found:" << pid_file(); - return false; - } - } - - std::stringstream error_message; - pid_t local_pid= get_pid_from_file(pid_file(), error_message); - if (local_pid > 0) - { - if (::kill(local_pid, 0) == 0) - { - return true; - } - } - - return false; - } - - const char *name() - { - return "memcached_light"; - }; - - const char *executable() - { - return MEMCACHED_LIGHT_BINARY; - } - - virtual void port_option(Application& app, in_port_t arg) - { - char buffer[1024]; - snprintf(buffer, sizeof(buffer), "--port=%d", int(arg)); - app.add_option(buffer); - } - - bool has_port_option() const - { - return true; - } - - bool is_libtool() - { - 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) : - Memcached(host_arg, port_arg, is_socket_arg, username_arg, password_arg) - { } - - const char *name() - { - return "memcached-sasl"; - }; - - const char *sasl() const - { - return " -S -B binary "; - } - - const char *executable() - { - return MEMCACHED_SASL_BINARY; - } - - bool ping() - { - memcached_return_t rc; - bool ret; - - if (has_socket()) - { - ret= libmemcached_util_ping2(socket().c_str(), 0, username().c_str(), password().c_str(), &rc); - } - else - { - ret= libmemcached_util_ping2(hostname().c_str(), port(), username().c_str(), password().c_str(), &rc); - } - - if (memcached_failed(rc) or ret == false) - { - error(memcached_strerror(NULL, rc)); - } - - return ret; - } - -}; - #include @@ -370,7 +210,7 @@ bool Memcached::build(size_t argc, const char *argv[]) add_option("-M"); #endif - if (sasl()) + if (_username.size()) { add_option(sasl()); } @@ -383,18 +223,6 @@ bool Memcached::build(size_t argc, const char *argv[]) return true; } -bool MemcachedLight::build(size_t argc, const char *argv[]) -{ - for (size_t x= 0 ; x < argc ; x++) - { - add_option(argv[x]); - } - - return true; -} - -namespace libtest { - libtest::Server *build_memcached(const std::string& hostname, const in_port_t try_port) { return new Memcached(hostname, try_port, false); @@ -405,31 +233,15 @@ libtest::Server *build_memcached_socket(const std::string& socket_file, const in return new Memcached(socket_file, try_port, true); } -libtest::Server *build_memcached_light(const std::string& hostname, const in_port_t try_port) -{ - return new MemcachedLight(hostname, try_port); -} - - libtest::Server *build_memcached_sasl(const std::string& hostname, const in_port_t try_port, const std::string& username, const std::string &password) { if (username.empty()) { - return new MemcachedSaSL(hostname, try_port, false, "memcached", "memcached"); + return new Memcached(hostname, try_port, false, "memcached", "memcached"); } - return new MemcachedSaSL(hostname, try_port, false, username, password); + return new Memcached(hostname, try_port, false, username, password); } -libtest::Server *build_memcached_sasl_socket(const std::string& socket_file, const in_port_t try_port, const std::string& username, const std::string &password) -{ - if (username.empty()) - { - return new MemcachedSaSL(socket_file, try_port, true, "memcached", "memcached"); - } - - return new MemcachedSaSL(socket_file, try_port, true, username, password); -} - -} +} // namespace libtest