projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Additions to testing to better check return values/etc for servers.
[m6w6/libmemcached]
/
libtest
/
memcached.cc
diff --git
a/libtest/memcached.cc
b/libtest/memcached.cc
index daf6787cf69b9c86bd2afaaefe2b58772c2b47d8..7e396c30a655b68c1f35f67a8288cf7964934b4b 100644
(file)
--- a/
libtest/memcached.cc
+++ b/
libtest/memcached.cc
@@
-22,8
+22,8
@@
#include <libtest/common.h>
#include <libtest/common.h>
-#include <libmemcached/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcached
-1.0
/memcached.h>
+#include <libmemcached
util-1.0
/util.h>
using namespace libtest;
using namespace libtest;
@@
-98,7
+98,12
@@
public:
memcached_return_t rc= MEMCACHED_SUCCESS;
if (has_socket())
{
memcached_return_t rc= MEMCACHED_SUCCESS;
if (has_socket())
{
- local_pid= libmemcached_util_getpid(socket().c_str(), 0, &rc);
+ if (socket().empty())
+ {
+ return -1;
+ }
+
+ local_pid= libmemcached_util_getpid(socket().c_str(), port(), &rc);
}
else
{
}
else
{
@@
-155,9
+160,12
@@
public:
return MEMCACHED_BINARY;
}
return MEMCACHED_BINARY;
}
-
const char *pid_file_option(
)
+
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
}
const char *socket_file_option() const
@@
-170,14
+178,29
@@
public:
return "-d";
}
return "-d";
}
-
const char *log_file_option(
)
+
virtual void port_option(Application& app, in_port_t arg
)
{
{
- return NULL;
+ char buffer[30];
+ snprintf(buffer, sizeof(buffer), "%d", int(arg));
+ app.add_option("-p", buffer);
+ }
+
+ bool has_port_option() const
+ {
+ return true;
}
}
- const char *port_option()
+ bool has_socket_file_option() const
{
{
- return "-p ";
+ return true;
+ }
+
+ void socket_file_option(Application& app, const std::string& socket_arg)
+ {
+ if (socket_arg.empty() == false)
+ {
+ app.add_option("-s", socket_arg);
+ }
}
bool is_libtool()
}
bool is_libtool()
@@
-295,25
+318,23
@@
bool Memcached::build(int argc, const char *argv[])
if (getuid() == 0 or geteuid() == 0)
{
if (getuid() == 0 or geteuid() == 0)
{
- a
rg_buffer << " -u root "
;
+ a
dd_option("-u", "root")
;
}
}
- a
rg_buffer << " -l 127.0.0.1 "
;
- a
rg_buffer << " -m 128 "
;
- a
rg_buffer << " -M "
;
+ a
dd_option("-l", "localhost")
;
+ a
dd_option("-m", "128")
;
+ a
dd_option("-M")
;
if (sasl())
{
if (sasl())
{
- a
rg_buffer << sasl(
);
+ a
dd_option(sasl()
);
}
for (int x= 1 ; x < argc ; x++)
{
}
for (int x= 1 ; x < argc ; x++)
{
- a
rg_buffer << " " << argv[x] << " "
;
+ a
dd_option(argv[x])
;
}
}
- set_extra_args(arg_buffer.str());
-
return true;
}
return true;
}