projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix valgrind issues.
[m6w6/libmemcached]
/
libtest
/
gearmand.cc
diff --git
a/libtest/gearmand.cc
b/libtest/gearmand.cc
index 6149b3c6c6470f1b4b049bcefbb97e7148d9cf0d..dda38fbdfab3b68ca32437fd8c20320c3fa2cf56 100644
(file)
--- a/
libtest/gearmand.cc
+++ b/
libtest/gearmand.cc
@@
-37,6
+37,7
@@
using namespace libtest;
#include <cstring>
#include <iostream>
#include <signal.h>
#include <cstring>
#include <iostream>
#include <signal.h>
+#include <sstream>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
@@
-66,13
+67,12
@@
public:
bool call(const bool success, const std::string &response)
{
_pid= -1;
bool call(const bool success, const std::string &response)
{
_pid= -1;
-
if (success and response.size())
{
_pid= atoi(response.c_str());
}
if (success and response.size())
{
_pid= atoi(response.c_str());
}
- if (
_pid < 1
)
+ if (
is_pid_valid(_pid) == false
)
{
_pid= -1;
return false;
{
_pid= -1;
return false;
@@
-90,11
+90,13
@@
private:
public:
Gearmand(const std::string& host_arg, in_port_t port_arg) :
libtest::Server(host_arg, port_arg)
public:
Gearmand(const std::string& host_arg, in_port_t port_arg) :
libtest::Server(host_arg, port_arg)
- { }
+ {
+ set_pid_file();
+ }
pid_t get_pid(bool error_is_ok)
{
pid_t get_pid(bool error_is_ok)
{
- if (
not pid_file().empty()
)
+ if (
pid_file().empty() == false
)
{
Wait wait(pid_file(), 0);
{
Wait wait(pid_file(), 0);
@@
-122,12
+124,12
@@
public:
bool ping()
{
gearman_client_st *client= gearman_client_create(NULL);
bool ping()
{
gearman_client_st *client= gearman_client_create(NULL);
- if (
not client
)
+ if (
client == NULL
)
{
Error << "Could not allocate memory for gearman_client_create()";
return false;
}
{
Error << "Could not allocate memory for gearman_client_create()";
return false;
}
- gearman_client_set_timeout(client,
1
000);
+ gearman_client_set_timeout(client,
3
000);
if (gearman_success(gearman_client_add_server(client, hostname().c_str(), port())))
{
if (gearman_success(gearman_client_add_server(client, hostname().c_str(), port())))
{
@@
-138,6
+140,13
@@
public:
gearman_client_free(client);
return true;
}
gearman_client_free(client);
return true;
}
+#if 0
+ Error << hostname().c_str() << ":" << port() << " was " << gearman_strerror(rc) << " extended: " << gearman_client_error(client);
+#endif
+ }
+ else
+ {
+ Error << "gearman_client_add_server() " << gearman_client_error(client);
}
gearman_client_free(client);
}
gearman_client_free(client);
@@
-155,24
+164,25
@@
public:
return GEARMAND_BINARY;
}
return GEARMAND_BINARY;
}
- const char *pid_file_option()
- {
- return "--pid-file=";
- }
-
const char *daemon_file_option()
{
return "--daemon";
}
const char *daemon_file_option()
{
return "--daemon";
}
-
const char *log_file_option(
)
+
void log_file_option(Application& app, const std::string& arg
)
{
{
- return "-vvvvv --log-file=";
+ if (arg.empty() == false)
+ {
+ std::string buffer("--log-file=");
+ buffer+= arg;
+ app.add_option("--verbose=DEBUG");
+ app.add_option(buffer);
+ }
}
}
- const char *port_option()
+ bool has_log_file_option() const
{
{
- return
"--port="
;
+ return
true
;
}
bool is_libtool()
}
bool is_libtool()
@@
-180,11
+190,18
@@
public:
return true;
}
return true;
}
- bool build(int argc, const char *argv[]);
-};
+ bool has_syslog() const
+ {
+ return true;
+ }
+ bool has_port_option() const
+ {
+ return true;
+ }
-#include <sstream>
+ bool build(int argc, const char *argv[]);
+};
bool Gearmand::build(int argc, const char *argv[])
{
bool Gearmand::build(int argc, const char *argv[])
{
@@
-192,18
+209,16
@@
bool Gearmand::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 << " --listen=127.0.0.1 "
;
+ a
dd_option("--listen=localhost")
;
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;
}