X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fgearmand.cc;h=82953e993de8c928375f3515fd2c819c08a2bd39;hb=25efe3485198149616820ab4e52d2f18f0abe5a7;hp=bcb7f8aaba2d7bcd7d033d4bf534b14b5ece03d2;hpb=70d0d339d06cbe6b35ef0efc4fd3d7e8f92b6a01;p=m6w6%2Flibmemcached diff --git a/libtest/gearmand.cc b/libtest/gearmand.cc index bcb7f8aa..82953e99 100644 --- a/libtest/gearmand.cc +++ b/libtest/gearmand.cc @@ -1,25 +1,40 @@ /* 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 #include @@ -48,40 +63,6 @@ using namespace libtest; #pragma GCC diagnostic ignored "-Wold-style-cast" #endif -class GetPid : public util::Instance::Finish -{ -private: - pid_t _pid; - -public: - GetPid() : - _pid(-1) - { } - - pid_t pid() - { - return _pid; - } - - - bool call(const bool success, const std::string &response) - { - _pid= -1; - if (success and response.size()) - { - _pid= atoi(response.c_str()); - } - - if (is_pid_valid(_pid) == false) - { - _pid= -1; - return false; - } - - return true; - } -}; - using namespace libtest; class Gearmand : public libtest::Server @@ -89,38 +70,11 @@ class Gearmand : public libtest::Server private: public: Gearmand(const std::string& host_arg, in_port_t port_arg) : - libtest::Server(host_arg, port_arg) + libtest::Server(host_arg, port_arg, GEARMAND_BINARY, true) { 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; - util::Instance instance(hostname(), port()); - instance.set_finish(get_instance_pid= new GetPid); - - instance.push(new util::Operation(test_literal_param("getpid\r\n"), true)); - - if (error_is_ok and instance.run() == false) - { - Error << "Failed to obtain pid of server"; - } - - return get_instance_pid->pid(); - } - bool ping() { gearman_client_st *client= gearman_client_create(NULL); @@ -140,9 +94,7 @@ public: gearman_client_free(client); return true; } -#if 0 Error << hostname().c_str() << ":" << port() << " was " << gearman_strerror(rc) << " extended: " << gearman_client_error(client); -#endif } else { @@ -159,29 +111,20 @@ public: return "gearmand"; }; - const char *executable() - { - return GEARMAND_BINARY; - } - - const char *pid_file_option() + void log_file_option(Application& app, const std::string& arg) { - return "--pid-file="; - } - - const char *daemon_file_option() - { - return "--daemon"; - } - - const char *log_file_option() - { - return "--verbose=DEBUG --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() @@ -190,31 +133,32 @@ public: } bool has_syslog() const + { + return false; // --syslog.errmsg-enable + } + + bool has_port_option() const { return true; } - bool build(int argc, const char *argv[]); + bool build(size_t argc, const char *argv[]); }; -bool Gearmand::build(int argc, const char *argv[]) +bool Gearmand::build(size_t argc, const char *argv[]) { - std::stringstream arg_buffer; - if (getuid() == 0 or geteuid() == 0) { - arg_buffer << " -u root "; + add_option("-u", "root"); } - arg_buffer << " --listen=localhost "; + add_option("--listen=localhost"); - for (int x= 1 ; x < argc ; x++) + for (size_t x= 0 ; x < argc ; x++) { - arg_buffer << " " << argv[x] << " "; + add_option(argv[x]); } - set_extra_args(arg_buffer.str()); - return true; }