*/
+#include <config.h>
#include <libtest/common.h>
-#include <libmemcached/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcached-1.0/memcached.h>
+#include <libmemcachedutil-1.0/util.h>
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();
}
return _username;
}
- pid_t get_pid(bool error_is_ok)
+ bool wait_for_pidfile() const
{
- // Memcached is slow to start, so we need to do this
- if (not pid_file().empty())
- {
- Wait wait(pid_file(), 0);
-
- if (error_is_ok and not wait.successful())
- {
- Error << "Pidfile was not found:" << pid_file();
- return -1;
- }
- }
+ Wait wait(pid(), 4);
- pid_t local_pid;
- memcached_return_t rc= MEMCACHED_SUCCESS;
- if (has_socket())
- {
- local_pid= libmemcached_util_getpid(socket().c_str(), 0, &rc);
- }
- else
- {
- local_pid= libmemcached_util_getpid(hostname().c_str(), port(), &rc);
- }
-
- if (error_is_ok and ((memcached_failed(rc) or not is_pid_valid(local_pid))))
- {
- Error << "libmemcached_util_getpid(" << memcached_strerror(NULL, rc) << ") pid: " << local_pid << " for:" << *this;
- }
-
- return local_pid;
+ return wait.successful();
}
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)
{
- Wait wait(pid_file(), 0);
-
- if (not wait.successful())
+ 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
{
ret= libmemcached_util_ping(hostname().c_str(), port(), &rc);
}
- if (memcached_failed(rc) or not ret)
+ if (memcached_failed(rc) or ret == false)
{
Error << "libmemcached_util_ping(" << hostname() << ", " << port() << ") error: " << memcached_strerror(NULL, rc);
}
return MEMCACHED_BINARY;
}
- const char *pid_file_option()
+ bool is_libtool()
{
- return "-P ";
+ return is_memcached_libtool();
+ }
+
+ virtual void pid_file_option(Application& app, const std::string& arg)
+ {
+ if (arg.empty() == false)
+ {
+ app.add_option("-P", arg);
+ }
}
const char *socket_file_option() const
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);
}
- 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;
}
- bool build(int argc, const char *argv[]);
+ bool build(size_t argc, const char *argv[]);
};
-class MemcachedSaSL : public Memcached
+class MemcachedLight : public libtest::Server
{
-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()
+public:
+ MemcachedLight(const std::string& host_arg, const in_port_t port_arg) :
+ libtest::Server(host_arg, port_arg, MEMCACHED_LIGHT_BINARY, true)
{
- return MEMCACHED_SASL_BINARY;
+ set_pid_file();
}
- pid_t get_pid(bool error_is_ok)
+ bool ping()
{
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
- Wait wait(pid_file(), 0);
-
- if (error_is_ok and not wait.successful())
+ if (not wait_for_pidfile())
{
Error << "Pidfile was not found:" << pid_file();
- return -1;
+ return false;
}
}
- pid_t local_pid;
- memcached_return_t rc;
- if (has_socket())
+ std::stringstream error_message;
+ pid_t local_pid= get_pid_from_file(pid_file(), error_message);
+ if (local_pid > 0)
{
- local_pid= libmemcached_util_getpid2(socket().c_str(), 0, username().c_str(), password().c_str(), &rc);
- }
- else
- {
- local_pid= libmemcached_util_getpid2(hostname().c_str(), port(), username().c_str(), password().c_str(), &rc);
+ if (::kill(local_pid, 0) == 0)
+ {
+ return true;
+ }
}
- if (error_is_ok and ((memcached_failed(rc) or not is_pid_valid(local_pid))))
+ 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)
{
- Error << "libmemcached_util_getpid2(" << memcached_strerror(NULL, rc) << ") username: " << username() << " password: " << password() << " pid: " << local_pid << " for:" << *this;
+ std::string buffer("--log-file=");
+ buffer+= arg;
+ app.add_option("--verbose");
+ app.add_option(buffer);
}
+ }
+
+ bool has_log_file_option() const
+ {
+ return true;
+ }
- return local_pid;
+ 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 (not pid_file().empty())
+ if (pid_file().empty() == false)
{
- Wait wait(pid_file(), 0);
-
- if (not wait.successful())
+ if (wait_for_pidfile() == false)
{
Error << "Pidfile was not found:" << pid_file();
return -1;
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);
}
#include <sstream>
-bool Memcached::build(int argc, const char *argv[])
+bool Memcached::build(size_t argc, const char *argv[])
{
- std::stringstream arg_buffer;
-
if (getuid() == 0 or geteuid() == 0)
{
- arg_buffer << " -u root ";
+ add_option("-u", "root");
}
- arg_buffer << " -l 127.0.0.1 ";
- arg_buffer << " -m 128 ";
- arg_buffer << " -M ";
+ add_option("-l", "localhost");
+ add_option("-m", "128");
+ add_option("-M");
if (sasl())
{
- arg_buffer << sasl();
+ add_option(sasl());
}
- for (int x= 1 ; x < argc ; x++)
+ for (int x= 0 ; x < argc ; x++)
{
- arg_buffer << " " << argv[x] << " ";
+ add_option(argv[x]);
}
- set_extra_args(arg_buffer.str());
+ 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;
}
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)
{
projects / m6w6 / libmemcached / blobdiff