projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Rollup from build trunk.
[m6w6/libmemcached]
/
libtest
/
memcached.cc
diff --git
a/libtest/memcached.cc
b/libtest/memcached.cc
index ceb2d878cca9e36a50fb3c1f18f90e80bccd14e1..05f43975c2c9134a2f41f86ee92fedbcecaa2583 100644
(file)
--- a/
libtest/memcached.cc
+++ b/
libtest/memcached.cc
@@
-87,9
+87,7
@@
public:
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
// 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 (error_is_ok and not wait_for_pidfile())
{
Error << "Pidfile was not found:" << pid_file();
return -1;
{
Error << "Pidfile was not found:" << pid_file();
return -1;
@@
-97,7
+95,7
@@
public:
}
pid_t local_pid;
}
pid_t local_pid;
- memcached_return_t rc;
+ memcached_return_t rc
= MEMCACHED_SUCCESS
;
if (has_socket())
{
local_pid= libmemcached_util_getpid(socket().c_str(), 0, &rc);
if (has_socket())
{
local_pid= libmemcached_util_getpid(socket().c_str(), 0, &rc);
@@
-120,9
+118,7
@@
public:
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
- Wait wait(pid_file(), 0);
-
- if (not wait.successful())
+ if (not wait_for_pidfile())
{
Error << "Pidfile was not found:" << pid_file();
return -1;
{
Error << "Pidfile was not found:" << pid_file();
return -1;
@@
-230,9
+226,7
@@
public:
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
// 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 (error_is_ok and not wait_for_pidfile())
{
Error << "Pidfile was not found:" << pid_file();
return -1;
{
Error << "Pidfile was not found:" << pid_file();
return -1;
@@
-263,9
+257,7
@@
public:
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
// Memcached is slow to start, so we need to do this
if (not pid_file().empty())
{
- Wait wait(pid_file(), 0);
-
- if (not wait.successful())
+ if (not wait_for_pidfile())
{
Error << "Pidfile was not found:" << pid_file();
return -1;
{
Error << "Pidfile was not found:" << pid_file();
return -1;
@@
-306,7
+298,7
@@
bool Memcached::build(int argc, const char *argv[])
arg_buffer << " -u root ";
}
arg_buffer << " -u root ";
}
- arg_buffer << " -l
127.0.0.1
";
+ arg_buffer << " -l
localhost
";
arg_buffer << " -m 128 ";
arg_buffer << " -M ";
arg_buffer << " -m 128 ";
arg_buffer << " -M ";