X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fmemcached.cc;h=e35166205599cf830d35780e44aa072fddf11869;hb=033a3a1829e8a1e0d170f748f6b7824e25ec45f4;hp=3b63c0fc485e08f63c077879ff844e0ae203dae8;hpb=48171051f3c496c6bb2841a3abadbe9faa9cad07;p=awesomized%2Flibmemcached diff --git a/libtest/memcached.cc b/libtest/memcached.cc index 3b63c0fc..e3516620 100644 --- a/libtest/memcached.cc +++ b/libtest/memcached.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,12 +34,9 @@ * */ -#include - -#include -#include +#include "libtest/yatlcon.h" -using namespace libtest; +#include "libtest/common.h" #include #include @@ -61,78 +58,70 @@ using namespace libtest; #pragma GCC diagnostic ignored "-Wold-style-cast" #endif -using namespace libtest; +namespace libtest { -class Memcached : public Server +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) : - 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(), false, is_socket_arg), + _username(username_arg), + _password(password_arg) { } - pid_t get_pid(bool error_is_ok) + 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(), false, is_socket_arg) { - // Memcached is slow to start, so we need to do this - if (not pid_file().empty()) - { - Wait wait(pid_file(), 0); + set_pid_file(); + } - if (error_is_ok and not wait.successful()) - { - Error << "Pidfile was not found:" << pid_file(); - return -1; - } - } + virtual const char *sasl() const + { + return NULL; + } - pid_t local_pid; - memcached_return_t rc; - if (has_socket()) - { - local_pid= libmemcached_util_getpid(socket().c_str(), port(), &rc); - } - else - { - local_pid= libmemcached_util_getpid(hostname().c_str(), port(), &rc); - } + const std::string& password() const + { + return _password; + } - if (error_is_ok and ((memcached_failed(rc) or local_pid < 1))) - { - Error << "libmemcached_util_getpid(" << memcached_strerror(NULL, rc) << ") pid: " << local_pid << " for:" << *this; - } + const std::string& username() const + { + return _username; + } - return local_pid; + bool wait_for_pidfile() const + { + Wait wait(pid(), 4); + + return wait.successful(); } bool ping() { - // Memcached is slow to start, so we need to do this - if (not pid_file().empty()) + if (out_of_ban_killed()) { - Wait wait(pid_file(), 0); - - if (not wait.successful()) - { - Error << "Pidfile was not found:" << pid_file(); - return -1; - } + return false; } - 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 not ret) - { - Error << "libmemcached_util_ping(" << memcached_strerror(NULL, rc) << ")"; - } - return ret; + SimpleClient client(_hostname, _port); + + std::string response; + return client.send_message("version", response); } const char *name() @@ -142,12 +131,20 @@ public: const char *executable() { - return MEMCACHED_BINARY; + return memcached_binary(); } - const char *pid_file_option() + bool is_libtool() + { + return false; + } + + virtual void pid_file_option(Application& app, const std::string& arg) { - return "-P "; + if (arg.empty() == false) + { + app.add_option("-P", arg); + } } const char *socket_file_option() const @@ -155,24 +152,35 @@ public: return "-s "; } - const char *daemon_file_option() + virtual void port_option(Application& app, in_port_t arg) { - return "-d"; + char buffer[30]; + snprintf(buffer, sizeof(buffer), "%d", int(arg)); + app.add_option("-p", buffer); + app.add_option("-U", buffer); } - const char *log_file_option() + bool has_port_option() const { - return NULL; + return true; } - const char *port_option() + bool has_socket_file_option() const { - return "-p "; + return has_socket(); } - bool is_libtool() + void socket_file_option(Application& app, const std::string& socket_arg) { - return false; + if (socket_arg.empty() == false) + { + app.add_option("-s", socket_arg); + } + } + + bool broken_socket_cleanup() + { + return true; } // Memcached's pidfile is broken @@ -181,42 +189,52 @@ public: return true; } - bool build(int argc, const char *argv[]); + bool build(); }; #include -bool Memcached::build(int argc, const char *argv[]) +bool Memcached::build() { - std::stringstream arg_buffer; - if (getuid() == 0 or geteuid() == 0) { - arg_buffer << " -u root "; + add_option("-u", "root"); } - for (int x= 1 ; x < argc ; x++) + add_option("-l", "localhost"); +#ifdef __APPLE__ +#else + add_option("-m", "128"); + add_option("-M"); +#endif + + if (sasl()) { - arg_buffer << " " << argv[x] << " "; + add_option(sasl()); } - set_extra_args(arg_buffer.str()); - return true; } -namespace libtest { - -Server *build_memcached(const std::string& hostname, const in_port_t try_port) +libtest::Server *build_memcached(const std::string& hostname, const in_port_t try_port) { - return new Memcached(hostname, try_port, false); + if (has_memcached()) + { + return new Memcached(hostname, try_port, false); + } + + return NULL; } -Server *build_memcached_socket(const std::string& hostname, const in_port_t try_port) +libtest::Server *build_memcached_socket(const std::string& socket_file, const in_port_t try_port) { - return new Memcached(hostname, try_port, true); -} + if (has_memcached()) + { + return new Memcached(socket_file, try_port, true); + } + return NULL; } +} // namespace libtest