X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fgearmand.cc;h=852cf19496e829c88cbbc311378d876f97507434;hb=1899ec2a3d1f4f180b0109879a966fd6603ece86;hp=7a33b4df058d383984b8af4f211ded631b635b40;hpb=9069819ac2940397e96210867e0666b801b97f60;p=awesomized%2Flibmemcached diff --git a/libtest/gearmand.cc b/libtest/gearmand.cc index 7a33b4df..852cf194 100644 --- a/libtest/gearmand.cc +++ b/libtest/gearmand.cc @@ -1,34 +1,44 @@ /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * libtest * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Data Differential YATL (i.e. libtest) library * - * 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. + * Copyright (C) 2012 Data Differential, http://datadifferential.com/ * - * 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. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * 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. * - * 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 "libtest/yatlcon.h" #include #include -#include "util/instance.hpp" -#include "util/operation.hpp" - -using namespace datadifferential; using namespace libtest; #include @@ -43,8 +53,6 @@ using namespace libtest; #include #include -#include - #ifndef __INTEL_COMPILER #pragma GCC diagnostic ignored "-Wold-style-cast" #endif @@ -55,43 +63,28 @@ class Gearmand : public libtest::Server { 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, bool libtool_, const char* binary); bool ping() { - gearman_client_st *client= gearman_client_create(NULL); - if (client == NULL) + reset_error(); + + if (out_of_ban_killed()) { - Error << "Could not allocate memory for gearman_client_create()"; return false; } - 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, 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 + SimpleClient client(_hostname, _port); + + std::string response; + bool ret= client.send_message("version", response); + + if (client.is_error()) { - Error << "gearman_client_add_server() " << gearman_client_error(client); + error(client.error()); } - gearman_client_free(client); - - return false;; + return ret; } const char *name() @@ -130,10 +123,16 @@ public: return true; } - bool build(size_t argc, const char *argv[]); + bool build(); }; -bool Gearmand::build(size_t argc, const char *argv[]) +Gearmand::Gearmand(const std::string& host_arg, in_port_t port_arg, bool libtool_, const char* binary_arg) : + libtest::Server(host_arg, port_arg, binary_arg, libtool_) +{ + set_pid_file(); +} + +bool Gearmand::build() { if (getuid() == 0 or geteuid() == 0) { @@ -142,19 +141,38 @@ bool Gearmand::build(size_t argc, const char *argv[]) add_option("--listen=localhost"); - for (size_t x= 0 ; x < argc ; x++) - { - add_option(argv[x]); - } - return true; } namespace libtest { -libtest::Server *build_gearmand(const char *hostname, in_port_t try_port) +libtest::Server *build_gearmand(const char *hostname, in_port_t try_port, const char* binary) { - return new Gearmand(hostname, try_port); + if (binary == NULL) + { +#if defined(HAVE_GEARMAND_BINARY) +# if defined(GEARMAND_BINARY) + if (HAVE_GEARMAND_BINARY) + { + binary= GEARMAND_BINARY; + } +# endif +#endif + } + + if (binary == NULL) + { + return NULL; + } + + bool is_libtool_script= true; + + if (binary[0] == '/') + { + is_libtool_script= false; + } + + return new Gearmand(hostname, try_port, is_libtool_script, binary); } }