projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Free port logic
[m6w6/libmemcached]
/
libtest
/
gearmand.cc
diff --git
a/libtest/gearmand.cc
b/libtest/gearmand.cc
index 9a7649ef07114a058fbbab2a969b424d4a509cc4..bcb7f8aaba2d7bcd7d033d4bf534b14b5ece03d2 100644
(file)
--- a/
libtest/gearmand.cc
+++ b/
libtest/gearmand.cc
@@
-21,6
+21,7
@@
#include <libtest/common.h>
#include <libtest/common.h>
+
#include <libtest/gearmand.h>
#include "util/instance.hpp"
#include <libtest/gearmand.h>
#include "util/instance.hpp"
@@
-36,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>
@@
-65,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;
@@
-83,17
+84,19
@@
public:
using namespace libtest;
using namespace libtest;
-class Gearmand : public Server
+class Gearmand : public
libtest::
Server
{
private:
public:
Gearmand(const std::string& host_arg, in_port_t port_arg) :
{
private:
public:
Gearmand(const std::string& host_arg, in_port_t port_arg) :
- Server(host_arg, 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);
@@
-121,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())))
{
@@
-137,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);
@@
-166,7
+176,7
@@
public:
const char *log_file_option()
{
const char *log_file_option()
{
- return "-
vvvvv
--log-file=";
+ return "-
-verbose=DEBUG
--log-file=";
}
const char *port_option()
}
const char *port_option()
@@
-179,12
+189,14
@@
public:
return true;
}
return true;
}
+ bool has_syslog() const
+ {
+ return true;
+ }
+
bool build(int argc, const char *argv[]);
};
bool build(int argc, const char *argv[]);
};
-
-#include <sstream>
-
bool Gearmand::build(int argc, const char *argv[])
{
std::stringstream arg_buffer;
bool Gearmand::build(int argc, const char *argv[])
{
std::stringstream arg_buffer;
@@
-194,7
+206,7
@@
bool Gearmand::build(int argc, const char *argv[])
arg_buffer << " -u root ";
}
arg_buffer << " -u root ";
}
- arg_buffer << " --listen=
127.0.0.1
";
+ arg_buffer << " --listen=
localhost
";
for (int x= 1 ; x < argc ; x++)
{
for (int x= 1 ; x < argc ; x++)
{
@@
-208,7
+220,7
@@
bool Gearmand::build(int argc, const char *argv[])
namespace libtest {
namespace libtest {
-Server *build_gearmand(const char *hostname, in_port_t try_port)
+
libtest::
Server *build_gearmand(const char *hostname, in_port_t try_port)
{
return new Gearmand(hostname, try_port);
}
{
return new Gearmand(hostname, try_port);
}