X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver.h;h=736810be0ae94b895ecf2523d479fa0bd54c1869;hb=2d9bd6ba5e72099ae4c5287ade99300c7f6bd1b7;hp=b91f55b13de3124b4102961efadffcba053ac3b4;hpb=6949713f6af6882749d4827e6af46c3ca7c3e8ff;p=m6w6%2Flibmemcached diff --git a/libtest/server.h b/libtest/server.h index b91f55b1..736810be 100644 --- a/libtest/server.h +++ b/libtest/server.h @@ -1,26 +1,43 @@ /* 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 */ #pragma once +#include + #include #include #include @@ -34,6 +51,10 @@ namespace libtest { struct Server { private: + typedef std::vector< std::pair > Options; + +private: + uint64_t _magic; bool _is_socket; std::string _socket; std::string _sasl; @@ -41,7 +62,6 @@ private: std::string _log_file; std::string _base_command; // executable command which include libtool, valgrind, gdb, etc std::string _running; // Current string being used for system() - pid_t _pid; protected: in_port_t _port; @@ -49,26 +69,73 @@ protected: std::string _extra_args; public: - Server(const std::string& hostname, const in_port_t port_arg, const bool is_socket_arg= false); + Server(const std::string& hostname, const in_port_t port_arg, + const std::string& executable, const bool _is_libtool, + const bool is_socket_arg= false); virtual ~Server(); virtual const char *name()= 0; - virtual const char *executable()= 0; - virtual const char *port_option()= 0; - virtual const char *pid_file_option()= 0; - virtual const char *daemon_file_option()= 0; - virtual const char *log_file_option()= 0; virtual bool is_libtool()= 0; - virtual bool broken_socket_cleanup() + virtual bool has_socket_file_option() const + { + return false; + } + + virtual void socket_file_option(Application& app, const std::string& socket_arg) + { + if (socket_arg.empty() == false) + { + std::string buffer("--socket="); + buffer+= socket_arg; + app.add_option(buffer); + } + } + + virtual bool has_log_file_option() const { return false; } - virtual const char *socket_file_option() const + virtual void log_file_option(Application& app, const std::string& arg) { - return NULL; + if (arg.empty() == false) + { + std::string buffer("--log-file="); + buffer+= arg; + app.add_option(buffer); + } + } + + virtual void pid_file_option(Application& app, const std::string& arg) + { + if (arg.empty() == false) + { + std::string buffer("--pid-file="); + buffer+= arg; + app.add_option(buffer); + } + } + + virtual bool has_port_option() const + { + return false; + } + + virtual void port_option(Application& app, in_port_t arg) + { + if (arg > 0) + { + char buffer[1024]; + snprintf(buffer, sizeof(buffer), "--port=%d", int(arg)); + app.add_option(buffer); + } + } + + virtual bool broken_socket_cleanup() + { + return false; } virtual bool broken_pid_file() @@ -110,9 +177,10 @@ public: virtual bool ping()= 0; - virtual pid_t get_pid(bool error_is_ok= false)= 0; + virtual bool build(size_t argc, const char *argv[])= 0; - virtual bool build(int argc, const char *argv[])= 0; + void add_option(const std::string&); + void add_option(const std::string&, const std::string&); in_port_t port() const { @@ -124,31 +192,40 @@ public: return (_port != 0); } + virtual bool has_syslog() const + { + return false; + } + // Reset a server if another process has killed the server void reset() { - _pid= -1; _pid_file.clear(); _log_file.clear(); } - void set_extra_args(const std::string &arg); + bool args(Application&); - bool args(std::string& options); + pid_t pid() const; - pid_t pid(); + bool has_pid() const; - pid_t pid() const + virtual bool has_pid_file() const { - return _pid; + return true; } - bool has_pid() const + const std::string& error() { - return (_pid > 1); + return _error; } - bool wait_for_pidfile() const; + void error(std::string arg) + { + _error= arg; + } + + virtual bool wait_for_pidfile() const; bool check_pid(pid_t pid_arg) const { @@ -165,15 +242,20 @@ public: return _running; } + bool check(); + std::string log_and_pid(); - bool kill(pid_t pid_arg); + bool kill(); bool start(); - bool command(std::string& command_arg); + bool command(libtest::Application& app); + + bool validate(); protected: - void nap(); bool set_pid_file(); + Options _options; + Application _app; private: bool is_helgrind() const; @@ -181,8 +263,8 @@ private: bool is_debug() const; bool set_log_file(); bool set_socket_file(); - void rebuild_base_command(); void reset_pid(); + std::string _error; }; std::ostream& operator<<(std::ostream& output, const libtest::Server &arg);