*
*/
-#include <config.h>
-#include <libtest/common.h>
+#include "libtest/yatlcon.h"
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
-
-using namespace libtest;
+#include "libtest/common.h"
#include <cassert>
#include <cerrno>
#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
{
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();
}
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 << "libmemcached_util_ping(" << hostname() << ", " << port() << ") error: " << memcached_strerror(NULL, rc);
- }
+ SimpleClient client(_hostname, _port);
- return ret;
+ std::string response;
+ return client.send_message("version", response);
}
const char *name()
bool is_libtool()
{
- return is_memcached_libtool();
+ return false;
}
virtual void pid_file_option(Application& app, const std::string& arg)
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 is slow to start, so we need to do this
- if (pid_file().empty() == false)
- {
- if (wait_for_pidfile() == false)
- {
- Error << "Pidfile was not found:" << pid_file();
- return -1;
- }
- }
-
- 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 << "libmemcached_util_ping2(" << hostname() << ", " << port() << ", " << username() << ", " << password() << ") error: " << memcached_strerror(NULL, rc);
- }
-
- return ret;
- }
-
+ bool build();
};
#include <sstream>
-bool Memcached::build(size_t argc, const char *argv[])
+bool Memcached::build()
{
if (getuid() == 0 or geteuid() == 0)
{
}
add_option("-l", "localhost");
+#ifdef __APPLE__
+#else
add_option("-m", "128");
add_option("-M");
+#endif
if (sasl())
{
add_option(sasl());
}
- for (int x= 0 ; x < argc ; x++)
- {
- add_option(argv[x]);
- }
-
- 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 (HAVE_MEMCACHED_BINARY)
{
- 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 (HAVE_MEMCACHED_BINARY)
{
- 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
projects / awesomized / libmemcached / blobdiff