projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix flag that clang knows nothing about.
[awesomized/libmemcached]
/
libtest
/
gearmand.cc
diff --git
a/libtest/gearmand.cc
b/libtest/gearmand.cc
index a70de37add7fdcbc8bcdc3e314f27d0e93d83cd5..f6dbdfce70ff23178b330c854649db695d75c9d3 100644
(file)
--- a/
libtest/gearmand.cc
+++ b/
libtest/gearmand.cc
@@
-69,11
+69,7
@@
class Gearmand : public libtest::Server
{
private:
public:
{
private:
public:
- Gearmand(const std::string& host_arg, in_port_t port_arg) :
- libtest::Server(host_arg, port_arg, GEARMAND_BINARY, true)
- {
- set_pid_file();
- }
+ Gearmand(const std::string& host_arg, in_port_t port_arg, const char* binary= GEARMAND_BINARY);
bool ping()
{
bool ping()
{
@@
-94,9
+90,11
@@
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
+
+ if (out_of_ban_killed() == false)
+ {
+ Error << hostname().c_str() << ":" << port() << " " << gearman_client_error(client);
+ }
}
else
{
}
else
{
@@
-147,6
+145,12
@@
public:
bool build(size_t argc, const char *argv[]);
};
bool build(size_t argc, const char *argv[]);
};
+Gearmand::Gearmand(const std::string& host_arg, in_port_t port_arg, const char* binary_arg) :
+ libtest::Server(host_arg, port_arg, binary_arg, true)
+{
+ set_pid_file();
+}
+
bool Gearmand::build(size_t argc, const char *argv[])
{
if (getuid() == 0 or geteuid() == 0)
bool Gearmand::build(size_t argc, const char *argv[])
{
if (getuid() == 0 or geteuid() == 0)
@@
-171,4
+175,9
@@
libtest::Server *build_gearmand(const char *hostname, in_port_t try_port)
return new Gearmand(hostname, try_port);
}
return new Gearmand(hostname, try_port);
}
+libtest::Server *build_gearmand(const char *hostname, in_port_t try_port, const char* binary)
+{
+ return new Gearmand(hostname, try_port, binary);
+}
+
}
}