projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update cursor
[m6w6/libmemcached]
/
libtest
/
memcached.cc
diff --git
a/libtest/memcached.cc
b/libtest/memcached.cc
index d17e5f51a12955d5bdb0d75bc480edbda6791f69..b8838a06a495bd4bbdf8702daf523e1d1953600d 100644
(file)
--- a/
libtest/memcached.cc
+++ b/
libtest/memcached.cc
@@
-97,7
+97,6
@@
public:
libtest::Server(host_arg, port_arg,
MEMCACHED_BINARY, is_memcached_libtool(), is_socket_arg)
{
libtest::Server(host_arg, port_arg,
MEMCACHED_BINARY, is_memcached_libtool(), is_socket_arg)
{
- set_pid_file();
}
virtual const char *sasl() const
}
virtual const char *sasl() const
@@
-115,27
+114,13
@@
public:
return _username;
}
return _username;
}
-
bool wait_for_pid
file() const
+
virtual bool has_pid_
file() const
{
{
- Wait wait(pid(), 4);
-
- return wait.successful();
+ return false;
}
bool ping()
{
}
bool ping()
{
-#if 0
- // 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() << " :" << running();
- return -1;
- }
- }
-#endif
-
memcached_return_t rc;
bool ret;
memcached_return_t rc;
bool ret;
@@
-150,7
+135,7
@@
public:
if (memcached_failed(rc) or ret == false)
{
if (memcached_failed(rc) or ret == false)
{
-
Error << "libmemcached_util_ping(" << hostname() << ", " << port() << ") error: " << memcached_strerror(NULL, rc
);
+
error(memcached_strerror(NULL, rc)
);
}
return ret;
}
return ret;
@@
-332,16
+317,6
@@
public:
bool ping()
{
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;
memcached_return_t rc;
bool ret;
@@
-356,7
+331,7
@@
public:
if (memcached_failed(rc) or ret == false)
{
if (memcached_failed(rc) or ret == false)
{
-
Error << "libmemcached_util_ping2(" << hostname() << ", " << port() << ", " << username() << ", " << password() << ") error: " << memcached_strerror(NULL, rc
);
+
error(memcached_strerror(NULL, rc)
);
}
return ret;
}
return ret;
@@
-375,8
+350,10
@@
bool Memcached::build(size_t argc, const char *argv[])
}
add_option("-l", "localhost");
}
add_option("-l", "localhost");
+#ifndef TARGET_OS_OSX
add_option("-m", "128");
add_option("-M");
add_option("-m", "128");
add_option("-M");
+#endif
if (sasl())
{
if (sasl())
{