X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fmemcached.cc;h=7af26092c650a12be452f1af98ead09b1cba971f;hb=b220134a312e2a488810abfef510f5dbf59078a4;hp=7d7920751c9bf8b66508d630a7a8c9d2f45e2cdf;hpb=23dca174eef8d846e3d4402729b57f6ded035e64;p=awesomized%2Flibmemcached diff --git a/libtest/memcached.cc b/libtest/memcached.cc index 7d792075..7af26092 100644 --- a/libtest/memcached.cc +++ b/libtest/memcached.cc @@ -34,13 +34,9 @@ * */ -#include "mem_config.h" -#include +#include "libtest/yatlcon.h" -#include -#include - -using namespace libtest; +#include "libtest/common.h" #include #include @@ -62,19 +58,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,14 +72,14 @@ 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(); } @@ -129,6 +113,11 @@ public: return false; } + if (is_socket()) + { + return _app.check(); + } + SimpleClient client(_hostname, _port); std::string response; @@ -142,12 +131,12 @@ public: const char *executable() { - return MEMCACHED_BINARY; + return memcached_binary(); } bool is_libtool() { - return is_memcached_libtool(); + return false; } virtual void pid_file_option(Application& app, const std::string& arg) @@ -167,7 +156,8 @@ public: { char buffer[30]; snprintf(buffer, sizeof(buffer), "%d", int(arg)); - app.add_option("-p", buffer); + app.add_option("-p", buffer); + app.add_option("-U", buffer); } bool has_port_option() const @@ -199,144 +189,13 @@ public: return true; } - 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; - } - + bool build(); }; #include -bool Memcached::build(size_t argc, const char *argv[]) +bool Memcached::build() { if (getuid() == 0 or geteuid() == 0) { @@ -344,7 +203,8 @@ bool Memcached::build(size_t argc, const char *argv[]) } add_option("-l", "localhost"); -#ifndef TARGET_OS_OSX +#ifdef __APPLE__ +#else add_option("-m", "128"); add_option("-M"); #endif @@ -354,61 +214,29 @@ bool Memcached::build(size_t argc, const char *argv[]) add_option(sasl()); } - for (size_t x= 0 ; x < argc ; x++) - { - add_option(argv[x]); - } + add_option("-vv"); 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); -} - -libtest::Server *build_memcached_socket(const std::string& socket_file, const in_port_t try_port) -{ - 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()) + if (has_memcached()) { - return new MemcachedSaSL(hostname, try_port, false, "memcached", "memcached"); + return new Memcached(hostname, try_port, false); } - return new MemcachedSaSL(hostname, try_port, false, username, password); + return NULL; } -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) +libtest::Server *build_memcached_socket(const std::string& socket_file, const in_port_t try_port) { - if (username.empty()) + if (has_memcached()) { - return new MemcachedSaSL(socket_file, try_port, true, "memcached", "memcached"); + return new Memcached(socket_file, try_port, true); } - return new MemcachedSaSL(socket_file, try_port, true, username, password); -} - + return NULL; } +} // namespace libtest