X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fgearmand.cc;h=caa75f651910ea214184c60134aa9c1ce8f27d52;hb=ad5d3efae1a492151ab2b08d370d86d27931c3a9;hp=c729d8ed836a763a69897acf819107a262155ac1;hpb=28602fd2f5f1c758b50cd82d4545da8e6c55f5c7;p=m6w6%2Flibmemcached diff --git a/libtest/gearmand.cc b/libtest/gearmand.cc index c729d8ed..caa75f65 100644 --- a/libtest/gearmand.cc +++ b/libtest/gearmand.cc @@ -4,43 +4,30 @@ * * Copyright (C) 2011 Data Differential, http://datadifferential.com/ * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + #include + #include -#include "util/instance.h" -#include "util/operation.h" +#include "util/instance.hpp" +#include "util/operation.hpp" -using namespace gearman_util; +using namespace datadifferential; using namespace libtest; #include @@ -50,20 +37,18 @@ using namespace libtest; #include #include #include +#include #include #include #include -#include -#include - #include #ifndef __INTEL_COMPILER #pragma GCC diagnostic ignored "-Wold-style-cast" #endif -class GetPid : public Instance::Finish +class GetPid : public util::Instance::Finish { private: pid_t _pid; @@ -82,69 +67,86 @@ public: bool call(const bool success, const std::string &response) { _pid= -1; - if (success and response.size()) { _pid= atoi(response.c_str()); } - if (_pid < 1) + if (is_pid_valid(_pid) == false) { _pid= -1; - return true; + return false; } - return false; + return true; } }; 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) : - Server(host_arg, port_arg) - { } + libtest::Server(host_arg, port_arg) + { + set_pid_file(); + } pid_t get_pid(bool error_is_ok) { + if (pid_file().empty() == false) + { + Wait wait(pid_file(), 0); + + if (error_is_ok and not wait.successful()) + { + Error << "Pidfile was not found:" << pid_file(); + return -1; + } + } + GetPid *get_instance_pid; - Instance instance(hostname(), port()); + util::Instance instance(hostname(), port()); instance.set_finish(get_instance_pid= new GetPid); - instance.push(new Operation(test_literal_param("getpid\r\n"), true)); + instance.push(new util::Operation(test_literal_param("getpid\r\n"), true)); - if (not instance.run() and not error_is_ok) + if (error_is_ok and instance.run() == false) { Error << "Failed to obtain pid of server"; } - _pid= get_instance_pid->pid(); - - return _pid; + return get_instance_pid->pid(); } 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; } - gearman_client_set_timeout(client, 1000); + gearman_client_set_timeout(client, 3000); if (gearman_success(gearman_client_add_server(client, hostname().c_str(), port()))) { - gearman_return_t rc= gearman_client_echo(client, gearman_literal_param("This is my echo test")); + gearman_return_t rc= gearman_client_echo(client, test_literal_param("This is my echo test")); if (gearman_success(rc)) { 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); @@ -162,24 +164,25 @@ public: return GEARMAND_BINARY; } - const char *pid_file_option() - { - return "--pid-file="; - } - 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() @@ -187,11 +190,18 @@ public: return true; } - bool build(int argc, const char *argv[]); -}; + bool has_syslog() const + { + return true; + } + void has_port_option() const + { + return true; + } -#include + bool build(int argc, const char *argv[]); +}; bool Gearmand::build(int argc, const char *argv[]) { @@ -199,22 +209,22 @@ bool Gearmand::build(int argc, const char *argv[]) if (getuid() == 0 or geteuid() == 0) { - arg_buffer << " -u root "; + add_option("-u", "root"); } + add_option("--listen=localhost"); + for (int x= 1 ; x < argc ; x++) { - arg_buffer << " " << argv[x] << " "; + add_option(argv[x]); } - set_extra_args(arg_buffer.str()); - return true; } 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); }