OSDN Git Service

ticket #323
authortakamaru <takamaru@1ed66053-1c2d-0410-8867-f7571e6e31d3>
Fri, 27 Feb 2009 04:57:52 +0000 (04:57 +0000)
committertakamaru <takamaru@1ed66053-1c2d-0410-8867-f7571e6e31d3>
Fri, 27 Feb 2009 04:57:52 +0000 (04:57 +0000)
command_receiver, command_session debug log implement

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-shamshel-IT@7340 1ed66053-1c2d-0410-8867-f7571e6e31d3

15 files changed:
include/command_receiver.h
include/command_session.h
src/command_receiver.cpp
src/command_session.cpp
unit_tests/command_receiver_test/Makefile
unit_tests/command_receiver_test/command_receiver_test.cpp
unit_tests/command_receiver_test/l7vs.cf [new file with mode: 0644]
unit_tests/command_receiver_test/sample.ini [deleted file]
unit_tests/command_session_test/Makefile
unit_tests/command_session_test/command_session_test.cpp
unit_tests/command_session_test/l7vs.cf [new file with mode: 0644]
unit_tests/command_session_test/sample.ini [deleted file]
unit_tests/command_thread_test/Makefile
unit_tests/command_thread_test/l7vs.cf [new file with mode: 0644]
unit_tests/command_thread_test/sample.ini [deleted file]

index 41dec66..feb4eee 100644 (file)
@@ -1,13 +1,27 @@
-//
-//!    @file   command_receiver.h
-//!    @brief  l7vsadm message receiver class
-//
-//     copyright (c) sdy corporation. 2008
-//     mail: a dot takamaru at sdy dot co dot jp
-//
-//     Distributed under the Boost Software License, Version 1.0.(See accompanying
-//     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
-//
+/*!
+ *     @file   command_receiver.h
+ *     @brief  l7vsadm message receiver class
+ *
+ * L7VSD: Linux Virtual Server for Layer7 Load Balancing
+ * Copyright (C) 2009  NTT COMWARE Corporation.
+ *
+ * This program 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 2.1 of the License, or (at your option) any later version.
+ *
+ * This program 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 St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ **********************************************************************/
+
 #ifndef        COMMAND_RECEIVER_H
 #define        COMMAND_RECEIVER_H
 
index 9648556..adadae5 100644 (file)
@@ -1,13 +1,27 @@
-//
-//!    @file   command_session.h
-//!    @brief  l7vsadm message session class
-//
-//     copyright (c) sdy corporation. 2009
-//     mail: a dot takamaru at sdy dot co dot jp
-//
-//     Distributed under the Boost Software License, Version 1.0.(See accompanying
-//     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
-//
+/*!
+ *     @file   command_session.h
+ *     @brief  l7vsadm message session class
+ *
+ * L7VSD: Linux Virtual Server for Layer7 Load Balancing
+ * Copyright (C) 2009  NTT COMWARE Corporation.
+ *
+ * This program 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 2.1 of the License, or (at your option) any later version.
+ *
+ * This program 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 St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ **********************************************************************/
+
 #ifndef        COMMAND_SESSION_H
 #define        COMMAND_SESSION_H
 
index 67314ae..c6f4c6c 100644 (file)
@@ -1,14 +1,29 @@
-//
-//!    @file   command_receiver.cpp
-//!    @brief  l7vsadm message receiver class
-//
-//     copyright (c) sdy corporation. 2008
-//     mail: a dot takamaru at sdy dot co dot jp
-//
-//     Distributed under the Boost Software License, Version 1.0.(See accompanying
-//     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
-//
-#include       "command_receiver.h"
+/*!
+ *     @file   command_receiver.cpp
+ *     @brief  l7vsadm message receiver class
+ *
+ * L7VSD: Linux Virtual Server for Layer7 Load Balancing
+ * Copyright (C) 2009  NTT COMWARE Corporation.
+ *
+ * This program 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 2.1 of the License, or (at your option) any later version.
+ *
+ * This program 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 St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ **********************************************************************/
+
+#include "logger.h"
+#include "command_receiver.h"
 
 namespace      l7vs{
 
@@ -20,6 +35,17 @@ command_receiver::command_receiver( boost::asio::io_service& io_service, const s
                :       dispatcher( io_service ),
                        acceptor_( io_service, boost::asio::local::stream_protocol::endpoint( file ) ),
                        vsd( parent ){
+       Logger  logger( LOG_CAT_L7VSD_COMMAND, 1, "command_receiver::command_receiver", __FILE__, __LINE__ );
+
+       /*-------- DEBUG LOG --------*/
+       if( LOG_LV_DEBUG == Logger::getLogLevel( LOG_CAT_L7VSD_COMMAND ) ){
+               std::stringstream       debugstr;
+               debugstr << "command_receiver::command_receiver arguments:";
+               debugstr << boost::format( "file=%s" ) % file;
+               Logger::putLogDebug( LOG_CAT_L7VSD_COMMAND, 1, debugstr.str(), __FILE__, __LINE__ );
+       }
+       /*------ DEBUG LOG END ------*/
+
        sockfile = file;
 
        // create command_session for first acception.
@@ -30,12 +56,12 @@ command_receiver::command_receiver( boost::asio::io_service& io_service, const s
                                                                this,
                                                                session,
                                                                boost::asio::placeholders::error));
-
-
 }
 
 //!    @brief          destructor
 command_receiver::~command_receiver(){
+       Logger  logger( LOG_CAT_L7VSD_COMMAND, 1, "command_receiver::~command_receiver", __FILE__, __LINE__ );
+
        unlink(sockfile.c_str());
 }
 
@@ -43,6 +69,8 @@ command_receiver::~command_receiver(){
 //!    @param[in]      command session
 //!    @param[in]      error code
 void   command_receiver::handle_accept( command_session::command_session_ptr session, const boost::system::error_code& err ){
+       Logger  logger( LOG_CAT_L7VSD_COMMAND, 1, "command_receiver::handle_accept", __FILE__, __LINE__ );
+
        // check async_accept() result.
        if ( !err ) {
                // command_session start.
index 489a68d..93dddf8 100644 (file)
@@ -1,16 +1,31 @@
-//
-//!    @file   command_session.cpp
-//!    @brief  l7vsadm message session class
-//
-//     copyright (c) sdy corporation. 2009
-//     mail: a dot takamaru at sdy dot co dot jp
-//
-//     Distributed under the Boost Software License, Version 1.0.(See accompanying
-//     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
-//
+/*!
+ *     @file   command_session.cpp
+ *     @brief  l7vsadm message session class
+ *
+ * L7VSD: Linux Virtual Server for Layer7 Load Balancing
+ * Copyright (C) 2009  NTT COMWARE Corporation.
+ *
+ * This program 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 2.1 of the License, or (at your option) any later version.
+ *
+ * This program 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 St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ **********************************************************************/
+
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/archive/text_iarchive.hpp>
-#include       "command_session.h"
+#include "logger.h"
+#include "command_session.h"
 
 namespace      l7vs{
 
@@ -20,6 +35,8 @@ namespace     l7vs{
 command_session::command_session(      boost::asio::io_service& io_service, l7vsd& parent )
                                                                :       unixsocket( io_service ),
                                                                        vsd( parent ){
+       Logger  logger( LOG_CAT_L7VSD_COMMAND, 1, "command_session::command_session", __FILE__, __LINE__ );
+
        // buffer initialize
        request_buffer.assign( 0x00 );
 
@@ -82,6 +99,8 @@ command_session::command_session(     boost::asio::io_service& io_service, l7vsd& pa
 //!    @param[in]      error code
 //!    @param[in]      read size
 void   command_session::handle_read( const boost::system::error_code& err, size_t size){
+       Logger  logger( LOG_CAT_L7VSD_COMMAND, 1, "command_session::handle_read", __FILE__, __LINE__ );
+
        if( !err ){
                // execute received command
                execute_command();
@@ -105,27 +124,33 @@ void      command_session::handle_read( const boost::system::error_code& err, size_t
 //!    @brief          write handler
 //!    @param[in]      error code
 void   command_session::handle_write( const boost::system::error_code& err ){
+       Logger  logger( LOG_CAT_L7VSD_COMMAND, 1, "command_session::handle_write", __FILE__, __LINE__ );
+
        if( err ){
                std::stringstream buf;
                buf << "handle_write error:" << err;
                Logger::putLogError(LOG_CAT_L7VSD_VIRTUALSERVICE, 1, buf.str(), __FILE__, __LINE__);
        }
-//     unixsocket.async_read_some( boost::asio::buffer( request_buffer ),
-//                                                             boost::bind(    &command_session::handle_read,
-//                                                                                             shared_from_this(),
-//                                                                                             boost::asio::placeholders::error,
-//                                                                                             boost::asio::placeholders::bytes_transferred ));
-
 }
 
 //!    @brief          execute request command
 void   command_session::execute_command(){
+       Logger  logger( LOG_CAT_L7VSD_COMMAND, 1, "command_session::execute_command", __FILE__, __LINE__ );
+
        // deserialize requestdata
        std::stringstream       ss;
        ss << &( request_buffer[0] );
        boost::archive::text_iarchive   ia(ss);
        ia >> request_data;
 
+       /*-------- DEBUG LOG --------*/
+       if( LOG_LV_DEBUG == Logger::getLogLevel( LOG_CAT_L7VSD_COMMAND ) ){
+               std::stringstream       debugstr;
+               debugstr << boost::format( "command_session_recv_request:%s" ) % request_data;
+               Logger::putLogDebug( LOG_CAT_L7VSD_COMMAND, 1, debugstr.str(), __FILE__, __LINE__ );
+       }
+       /*------ DEBUG LOG END ------*/
+
        // execute command
        command_handler_map_type::iterator itr = command_handler_map.find( request_data.command );
        if( itr != command_handler_map.end() ){
@@ -145,6 +170,14 @@ void       command_session::execute_command(){
                response_data.message = "command not found.";
        }
 
+       /*-------- DEBUG LOG --------*/
+       if( LOG_LV_DEBUG == Logger::getLogLevel( LOG_CAT_L7VSD_COMMAND ) ){
+               std::stringstream       debugstr;
+               debugstr << boost::format( "command_session_send_response:%s" ) % response_data;
+               Logger::putLogDebug( LOG_CAT_L7VSD_COMMAND, 1, debugstr.str(), __FILE__, __LINE__ );
+       }
+       /*------ DEBUG LOG END ------*/
+
        // serialize responsedata
        boost::archive::text_oarchive   oa( response_stream );
        oa << (const l7vsd_response&) response_data;
@@ -152,6 +185,8 @@ void        command_session::execute_command(){
 
 //!    @brief          session start
 void   command_session::start(){
+       Logger  logger( LOG_CAT_L7VSD_COMMAND, 1, "command_session::start", __FILE__, __LINE__ );
+
        // start async read requestdata from unixsocket.
        unixsocket.async_read_some( boost::asio::buffer( request_buffer ),
                                                                boost::bind(    &command_session::handle_read,
index 60bdcfb..ed5df36 100644 (file)
@@ -5,7 +5,7 @@
 #
 TARGET         = command_receiver_ut
 CPP                    = g++
-CPPFLAGS       = -Wall -O0 -g -Werror -pthread -D PARAMETER_FILE='"./sample.ini"'
+CPPFLAGS       = -Wall -O0 -g -Werror -pthread -D PARAMETER_FILE='"./l7vs.cf"'
 INCLUDES       =       -I../../logger \
                                -I../../parameter \
                                -I../../include
@@ -46,8 +46,8 @@ LOGGER_OBJS   = $(LOGGER_SRCS:.cpp=.o)
 
 all:   $(TARGET)
 
-$(TARGET):     $(OBJS) $(PARAMETER) $(LOGGER)
-       $(CPP) $(INCLUDES) -o $@ $(OBJS) $(LIBS) $(PARAMETER) $(LOGGER)
+$(TARGET):     $(OBJS) $(LOGGER) $(PARAMETER)
+       $(CPP) $(INCLUDES) -o $@ $(OBJS) $(LIBS) $(LOGGER) $(PARAMETER)
 
 $(PARAMETER):  $(PARAMETER_OBJS)
        $(AR) $(ARFLAGS) $@ $(PARAMETER_OBJS)
@@ -56,4 +56,4 @@ $(LOGGER):    $(LOGGER_OBJS)
        $(AR) $(ARFLAGS) $@ $(LOGGER_OBJS)
 
 clean:
-       rm -f $(TARGET) $(OBJS) $(PARAMETER) $(PARAMETER_OBJS) $(LOGGER) $(LOGGER_OBJS)
+       rm -f $(TARGET) $(OBJS) $(PARAMETER) $(PARAMETER_OBJS) $(LOGGER) $(LOGGER_OBJS) *.log
index cc80ca8..82203e0 100644 (file)
@@ -4,6 +4,9 @@
 #include <boost/asio.hpp>
 #include <boost/filesystem.hpp>
 
+#include "logger.h"
+#include "parameter.h"
+
 #include "l7vsd_stub.h"
 #include "command_session_stub.h"
 
@@ -102,8 +105,12 @@ void       receiver_test(){
 test_suite*    init_unit_test_suite( int argc, char* argv[] ){
 
        test_suite* ts = BOOST_TEST_SUITE( "command_receiver class test" );
-       ts->add( BOOST_TEST_CASE( &receiver_test ) );
 
+       l7vs::Logger    logger_instance;
+       l7vs::Parameter parameter_instance;
+       logger_instance.loadConf();
+
+       ts->add( BOOST_TEST_CASE( &receiver_test ) );
 
        framework::master_test_suite().add( ts );
 
diff --git a/unit_tests/command_receiver_test/l7vs.cf b/unit_tests/command_receiver_test/l7vs.cf
new file mode 100644 (file)
index 0000000..b54f5d7
--- /dev/null
@@ -0,0 +1,210 @@
+#
+# UltraMonkey - L7 configuration file
+# 2008-2009 (C) NTT Comware
+# License: GNU General Public License (GPL)
+#
+#
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program 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
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA
+# 
+#
+# Rivision History.
+#      3.0.0   MultiThread version release.
+#      1.2.0   First verion release.(version was put together l7vsd)
+#              - 2008/03/26 Norihisa Nakai.
+
+
+#
+# l7vs log setting
+#
+[logger]
+# l7vsd logfile base name
+l7vsd_log_filename = "l7vsd.log"
+# l7vsd log rotate pattern
+l7vsd_rotation = "size"
+# l7vsd rotate max backup number
+l7vsd_max_backup_index = "10"
+# l7vsd rotate file size
+l7vsd_max_filesize = "10M"
+
+# l7vsd connection logfile base name
+l7vsd_conn_log_filename = "l7vsd_conn.log"
+# l7vsd connection log rotate pattern
+l7vsd_conn_rotation = "size"
+# l7vsd connection rotate max backup number
+l7vsd_conn_max_backup_index = "10"
+# l7vsd connection rotate file size
+l7vsd_conn_max_filesize = "10M"
+
+# l7vsd log categories level
+l7vsd_network                                  = "info"
+l7vsd_network_qos                              = "info"
+l7vsd_network_bandwidth                        = "info"
+l7vsd_network_num_connection   = "info"
+l7vsd_network_access                   = "info"
+l7vsd_mainthread                               = "info"
+l7vsd_virtualservice                   = "info"
+l7vsd_virtualservice_thread            = "info"
+l7vsd_session                                  = "info"
+l7vsd_session_thread                   = "info"
+l7vsd_realserver                               = "info"
+l7vsd_sorryserver                              = "info"
+l7vsd_module                                   = "info"
+l7vsd_replication                              = "info"
+l7vsd_replication_sendthread   = "info"
+l7vsd_parameter                                        = "info"
+l7vsd_logger                                   = "info"
+l7vsd_command                                  = "debug"
+l7vsd_start_stop                               = "info"
+l7vsd_system                                   = "info"
+l7vsd_system_memory                            = "info"
+l7vsd_system_endpoint                  = "info"
+l7vsd_system_signal                            = "info"
+l7vsd_system_environment               = "info"
+l7vsd_snmpbridge                               = "info"
+
+l7vsd_protocol                                 = "info"
+l7vsd_schedule                                 = "info"
+
+# l7vsadm log file base name
+l7vsadm_log_filename = "l7vsadm.log"
+# l7vsadm rotate pattern
+l7vsadm_rotation = "date"
+# l7vsadm rotate max backup number
+l7vsadm_max_backup_index = "10"
+# l7vsadm rotate timing ( every month rotate )
+l7vsadm_rotation_timing = "month"
+# l7vsadm rotate timing ( day and time )
+l7vsadm_rotation_timing_value = "1 0:01"
+
+# l7vsadm log categories level
+l7vsadm_parse                  = "info"
+l7vsadm_operate                        = "info"
+l7vsadm_config_result  = "info"
+l7vsadm_common                 = "info"
+l7vsadm_logger                 = "info"
+l7vsadm_parameter              = "info"
+l7vsadm_module                 = "info"
+
+l7vsadm_protocol               = "info"
+l7vsadm_schedule               = "info"
+
+# snmpagent log file base name
+snmp_log_filename = "snmpagent.log"
+# snmpagent log rotate pattern
+snmp_rotation = "datesize"
+# snmpagent log rotate max backup num
+snmp_max_backup_index = "10"
+# snmpagent max logfile size
+snmp_max_filesize = "30M"
+# snmpagent log rotate timing ( every week )
+snmp_rotation_timing = "week"
+# snmpagent log rotate timing ( a day of week and time )
+snmp_rotation_timing_value = "wed 23:59"
+
+# snmpagent connection log file base name
+snmp_conn_log_filename = "snmpagent.log"
+# snmpagent connection log rotate pattern
+snmp_conn_rotation = "datesize"
+# snmpagent connection log rotate max backup num
+snmp_conn_max_backup_index = "10"
+# snmpagent connection max logfile size
+snmp_conn_max_filesize = "30M"
+# snmpagent connection log rotate timing ( every week )
+snmp_conn_rotation_timing = "week"
+# snmpagent connection log rotate timing ( a day of week and time )
+snmp_conn_rotation_timing_value = "wed 23:59"
+
+# snmpagent log categories level
+snmpagent_start_stop                   = "info"
+snmpagent_manager_receive              = "info"
+snmpagent_manager_send                 = "info"
+snmpagent_l7vsd_receive                        = "info"
+snmpagent_l7vsd_send                   = "info"
+snmpagent_logger                               = "info"
+snmpagent_parameter                            = "info"
+snmpagent_system                               = "info"
+snmpagent_system_memory                        = "info"
+snmpagent_system_endpoint              = "info"
+snmpagent_system_signal                        = "info"
+snmpagent_system_environment   = "info"
+
+# sslproxy logfile base name
+sslproxy_log_filename = "sslproxy.log"
+# sslproxy log rotate pattern
+sslproxy_rotation = "size"
+# sslproxy rotate max backup number
+sslproxy_max_backup_index = "10"
+# sslproxy rotate file size
+sslproxy_max_filesize = "10M"
+
+# sslproxy connection logfile base name
+sslproxy_conn_log_filename = "sslproxy_conn.log"
+# sslproxy connection log rotate pattern
+sslproxy_conn_rotation = "size"
+# sslproxy connection rotate max backup number
+sslproxy_conn_max_backup_index = "10"
+# sslproxy connection rotate file size
+sslproxy_conn_max_filesize = "10M"
+
+# l7vsadm log categories level
+sslproxy_logger                        = "info"
+sslproxy_parameter             = "info"
+sslproxy_common                        = "info"
+sslproxy_server                        = "info"
+sslproxy_session               = "info"
+sslproxy_connection            = "info"
+
+[virtualservice]
+session_thread_pool_size       = 256
+throughput_calc_interval       = 500
+
+#
+# l7vsadm setting
+#
+[l7vsadm]
+cmd_interval = 1
+cmd_count = 10
+con_interval = 1
+con_count = 10
+
+
+#
+# l7vsd replication setting
+#
+[replication]
+#ip_addr = "192.168.0.254"
+#service_name = "40000"
+#nic = "eth0"
+#interval = 1000
+#compulsorily_interval = 40
+
+#cmponent_id_00 = "virtualservice"
+#cmponent_size_00 = 64
+#cmponent_id_01 = "chash"
+#cmponent_size_01 = 1
+#cmponent_id_02 = "sslid"
+#cmponent_size_02 = 222
+
+#
+# snmpagent settings
+#
+[snmpagent]
+nic = "eth0"
+ip_addr = "127.0.0.1"
+port = 60162
+interval = 1000
+status = 0
diff --git a/unit_tests/command_receiver_test/sample.ini b/unit_tests/command_receiver_test/sample.ini
deleted file mode 100644 (file)
index ed60924..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-# UltraMonkey - L7 configuration file
-# 2008 (C) NTT Comware
-# License: GNU General Public License (GPL)
-#
-#
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-#
-# Rivision History.
-#      1.2.0   First verion release.(version was put together l7vsd)
-#              - 2008/03/26 Norihisa Nakai.
-
-
-#
-# l7vs log setting
-#
-[logger]
-# l7vsd logfile base name
-l7vsd_log_filename = "./l7vsd.log"
-# l7vsd log rotate pattern
-l7vsd_rotation = "size"
-# l7vsd rotate max backup number
-l7vsd_max_backup_index = "10"
-# l7vsd rotate file size
-l7vsd_max_filesize = "10M"
-
-l7vsd_conn_log_filename = "./l7vsd_conn.log"
-l7vsd_conn_rotation = "size"
-l7vsd_conn_max_backup_index = "10"
-l7vsd_conn_max_filesize = "10M"
-
-# l7vsd log categories level
-l7vsd_network                  = "info"
-l7vsd_network_bandwidth                = "info"
-l7vsd_network_num_connection   = "info"
-l7vsd_network_qos              = "info"
-l7vsd_network_access           = "info"
-l7vsd_mainthread               = "info"
-l7vsd_virtualservice           = "info"
-l7vsd_virtualservice_thread            = "info"
-l7vsd_session          = "info"
-l7vsd_session_thread           = "info"
-l7vsd_realserver               = "info"
-l7vsd_sorryserver              = "info"
-l7vsd_replication              = "info"
-l7vsd_replication_sendthread           = "info"
-l7vsd_command          = "info"
-l7vsd_startstop                = "info"
-l7vsd_system                   = "info"
-l7vsd_system_memory            = "info"
-l7vsd_system_socket            = "info"
-l7vsd_system_signal            = "info"
-l7vsd_system_enviroment                = "info"
-l7vsd_system_endpoint          = "info"
-l7vsd_logger                   = "info"
-l7vsd_parameter                        = "info"
-l7vsd_event                    = "info"
-l7vsd_program                  = "info"
-l7vsd_module                   = "info"
-l7vsd_protocol                 = "info"
-l7vsd_schedule                 = "info"
-
-# l7vsadm log file base name
-l7vsadm_log_filename = "/var/log/l7vs/l7vsadm.log"
-# l7vsadm rotate pattern
-l7vsadm_rotation = "date"
-# l7vsadm rotate max backup number
-l7vsadm_max_backup_index = "10"
-# l7vsadm rotate timing ( every month rotate )
-l7vsadm_rotation_timing = "month"
-# l7vsadm rotate timing ( day and time )
-l7vsadm_rotation_timing_value = "1 0:01"
-
-# l7vsadm log categories level
-l7vsadm_parse                  = "info"
-l7vsadm_operate                        = "info"
-l7vsadm_communicate            = "info"
-l7vsadm_config_result          = "info"
-l7vsadm_common                 = "info"
-l7vsadm_logger                 = "info"
-l7vsadm_parameter              = "info"
-l7vsadm_module                 = "info"
-l7vsadm_protocol               = "info"
-l7vsadm_schedule                       = "info"
-
-# snmpagent log file base name
-snmpagent_log_filename = "/var/log/l7vs/snmpagent.log"
-# snmpagent log rotate pattern
-snmpagent_rotation = "datesize"
-# snmpagent log rotate max backup num
-snmpagent_max_backup_index = "10"
-# snmpagent max logfile size
-snmpagent_max_filesize = "30M"
-# snmpagent log rotate timing ( every week )
-snmpagent_rotation_timing = "week"
-# snmpagent log rotate timing ( a day of week and time )
-snmpagent_rotation_timing_value = "wed 23:59"
-
-# snmpagent log categories level
-snmpagent_start_stop           = "info"
-snmpagent_manager_receive      = "info"
-snmpagent_manager_send         = "info"
-snmpagent_l7vsd_receive                = "info"
-snmpagent_l7vsd_send           = "info"
-snmpagent_logger               = "info"
-snmpagent_parameter            = "info"
-
-#
-# l7vsadm setting
-#
-[l7vsadm]
-cmd_interval = 1
-cmd_count = 10
-con_interval = 1
-con_count = 10
-
-
-#
-# l7vsd replication setting
-#
-[replication]
-ip_addr = "192.168.0.20"
-service_name = "40000"
-nic = "eth1"
-interval = 1000
-compulsorily_interval = 40
-
-cmponent_id_00 = "virtualservice"
-cmponent_size_00 = 64
-cmponent_id_01 = "chash"
-cmponent_size_01 = 1
-cmponent_id_02 = "sslid"
-cmponent_size_02 = 200
-
-#
-# snmpagent settings
-#
-[snmpagent]
-nic = "eth0"
-ip_addr = "172.0.0.1"
-port = 60162
-interval = 1000
-status = 0
index aeefb1c..363314c 100644 (file)
@@ -5,7 +5,7 @@
 #
 TARGET         = command_session_ut
 CPP                    = g++
-CPPFLAGS       = -Wall -O0 -g -Werror -pthread -D PARAMETER_FILE='"./sample.ini"'
+CPPFLAGS       = -Wall -O0 -g -Werror -pthread -D PARAMETER_FILE='"./l7vs.cf"'
 INCLUDES       =       -I../../logger \
                                -I../../parameter \
                                -I../../include
@@ -56,4 +56,4 @@ $(LOGGER):    $(LOGGER_OBJS)
        $(AR) $(ARFLAGS) $@ $(LOGGER_OBJS)
 
 clean:
-       rm -f $(TARGET) $(OBJS) $(PARAMETER) $(PARAMETER_OBJS) $(LOGGER) $(LOGGER_OBJS)
+       rm -f $(TARGET) $(OBJS) $(PARAMETER) $(PARAMETER_OBJS) $(LOGGER) $(LOGGER_OBJS) *.log
index 3255cfa..af665b4 100644 (file)
@@ -660,8 +660,6 @@ test_suite* init_unit_test_suite( int argc, char* argv[] ){
        ts->add( BOOST_TEST_CASE( &snmp_test ) );
        ts->add( BOOST_TEST_CASE( &param_test ) );
 
-
-
        framework::master_test_suite().add( ts );
 
        return 0;
diff --git a/unit_tests/command_session_test/l7vs.cf b/unit_tests/command_session_test/l7vs.cf
new file mode 100644 (file)
index 0000000..b54f5d7
--- /dev/null
@@ -0,0 +1,210 @@
+#
+# UltraMonkey - L7 configuration file
+# 2008-2009 (C) NTT Comware
+# License: GNU General Public License (GPL)
+#
+#
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program 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
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA
+# 
+#
+# Rivision History.
+#      3.0.0   MultiThread version release.
+#      1.2.0   First verion release.(version was put together l7vsd)
+#              - 2008/03/26 Norihisa Nakai.
+
+
+#
+# l7vs log setting
+#
+[logger]
+# l7vsd logfile base name
+l7vsd_log_filename = "l7vsd.log"
+# l7vsd log rotate pattern
+l7vsd_rotation = "size"
+# l7vsd rotate max backup number
+l7vsd_max_backup_index = "10"
+# l7vsd rotate file size
+l7vsd_max_filesize = "10M"
+
+# l7vsd connection logfile base name
+l7vsd_conn_log_filename = "l7vsd_conn.log"
+# l7vsd connection log rotate pattern
+l7vsd_conn_rotation = "size"
+# l7vsd connection rotate max backup number
+l7vsd_conn_max_backup_index = "10"
+# l7vsd connection rotate file size
+l7vsd_conn_max_filesize = "10M"
+
+# l7vsd log categories level
+l7vsd_network                                  = "info"
+l7vsd_network_qos                              = "info"
+l7vsd_network_bandwidth                        = "info"
+l7vsd_network_num_connection   = "info"
+l7vsd_network_access                   = "info"
+l7vsd_mainthread                               = "info"
+l7vsd_virtualservice                   = "info"
+l7vsd_virtualservice_thread            = "info"
+l7vsd_session                                  = "info"
+l7vsd_session_thread                   = "info"
+l7vsd_realserver                               = "info"
+l7vsd_sorryserver                              = "info"
+l7vsd_module                                   = "info"
+l7vsd_replication                              = "info"
+l7vsd_replication_sendthread   = "info"
+l7vsd_parameter                                        = "info"
+l7vsd_logger                                   = "info"
+l7vsd_command                                  = "debug"
+l7vsd_start_stop                               = "info"
+l7vsd_system                                   = "info"
+l7vsd_system_memory                            = "info"
+l7vsd_system_endpoint                  = "info"
+l7vsd_system_signal                            = "info"
+l7vsd_system_environment               = "info"
+l7vsd_snmpbridge                               = "info"
+
+l7vsd_protocol                                 = "info"
+l7vsd_schedule                                 = "info"
+
+# l7vsadm log file base name
+l7vsadm_log_filename = "l7vsadm.log"
+# l7vsadm rotate pattern
+l7vsadm_rotation = "date"
+# l7vsadm rotate max backup number
+l7vsadm_max_backup_index = "10"
+# l7vsadm rotate timing ( every month rotate )
+l7vsadm_rotation_timing = "month"
+# l7vsadm rotate timing ( day and time )
+l7vsadm_rotation_timing_value = "1 0:01"
+
+# l7vsadm log categories level
+l7vsadm_parse                  = "info"
+l7vsadm_operate                        = "info"
+l7vsadm_config_result  = "info"
+l7vsadm_common                 = "info"
+l7vsadm_logger                 = "info"
+l7vsadm_parameter              = "info"
+l7vsadm_module                 = "info"
+
+l7vsadm_protocol               = "info"
+l7vsadm_schedule               = "info"
+
+# snmpagent log file base name
+snmp_log_filename = "snmpagent.log"
+# snmpagent log rotate pattern
+snmp_rotation = "datesize"
+# snmpagent log rotate max backup num
+snmp_max_backup_index = "10"
+# snmpagent max logfile size
+snmp_max_filesize = "30M"
+# snmpagent log rotate timing ( every week )
+snmp_rotation_timing = "week"
+# snmpagent log rotate timing ( a day of week and time )
+snmp_rotation_timing_value = "wed 23:59"
+
+# snmpagent connection log file base name
+snmp_conn_log_filename = "snmpagent.log"
+# snmpagent connection log rotate pattern
+snmp_conn_rotation = "datesize"
+# snmpagent connection log rotate max backup num
+snmp_conn_max_backup_index = "10"
+# snmpagent connection max logfile size
+snmp_conn_max_filesize = "30M"
+# snmpagent connection log rotate timing ( every week )
+snmp_conn_rotation_timing = "week"
+# snmpagent connection log rotate timing ( a day of week and time )
+snmp_conn_rotation_timing_value = "wed 23:59"
+
+# snmpagent log categories level
+snmpagent_start_stop                   = "info"
+snmpagent_manager_receive              = "info"
+snmpagent_manager_send                 = "info"
+snmpagent_l7vsd_receive                        = "info"
+snmpagent_l7vsd_send                   = "info"
+snmpagent_logger                               = "info"
+snmpagent_parameter                            = "info"
+snmpagent_system                               = "info"
+snmpagent_system_memory                        = "info"
+snmpagent_system_endpoint              = "info"
+snmpagent_system_signal                        = "info"
+snmpagent_system_environment   = "info"
+
+# sslproxy logfile base name
+sslproxy_log_filename = "sslproxy.log"
+# sslproxy log rotate pattern
+sslproxy_rotation = "size"
+# sslproxy rotate max backup number
+sslproxy_max_backup_index = "10"
+# sslproxy rotate file size
+sslproxy_max_filesize = "10M"
+
+# sslproxy connection logfile base name
+sslproxy_conn_log_filename = "sslproxy_conn.log"
+# sslproxy connection log rotate pattern
+sslproxy_conn_rotation = "size"
+# sslproxy connection rotate max backup number
+sslproxy_conn_max_backup_index = "10"
+# sslproxy connection rotate file size
+sslproxy_conn_max_filesize = "10M"
+
+# l7vsadm log categories level
+sslproxy_logger                        = "info"
+sslproxy_parameter             = "info"
+sslproxy_common                        = "info"
+sslproxy_server                        = "info"
+sslproxy_session               = "info"
+sslproxy_connection            = "info"
+
+[virtualservice]
+session_thread_pool_size       = 256
+throughput_calc_interval       = 500
+
+#
+# l7vsadm setting
+#
+[l7vsadm]
+cmd_interval = 1
+cmd_count = 10
+con_interval = 1
+con_count = 10
+
+
+#
+# l7vsd replication setting
+#
+[replication]
+#ip_addr = "192.168.0.254"
+#service_name = "40000"
+#nic = "eth0"
+#interval = 1000
+#compulsorily_interval = 40
+
+#cmponent_id_00 = "virtualservice"
+#cmponent_size_00 = 64
+#cmponent_id_01 = "chash"
+#cmponent_size_01 = 1
+#cmponent_id_02 = "sslid"
+#cmponent_size_02 = 222
+
+#
+# snmpagent settings
+#
+[snmpagent]
+nic = "eth0"
+ip_addr = "127.0.0.1"
+port = 60162
+interval = 1000
+status = 0
diff --git a/unit_tests/command_session_test/sample.ini b/unit_tests/command_session_test/sample.ini
deleted file mode 100644 (file)
index ed60924..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-# UltraMonkey - L7 configuration file
-# 2008 (C) NTT Comware
-# License: GNU General Public License (GPL)
-#
-#
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-#
-# Rivision History.
-#      1.2.0   First verion release.(version was put together l7vsd)
-#              - 2008/03/26 Norihisa Nakai.
-
-
-#
-# l7vs log setting
-#
-[logger]
-# l7vsd logfile base name
-l7vsd_log_filename = "./l7vsd.log"
-# l7vsd log rotate pattern
-l7vsd_rotation = "size"
-# l7vsd rotate max backup number
-l7vsd_max_backup_index = "10"
-# l7vsd rotate file size
-l7vsd_max_filesize = "10M"
-
-l7vsd_conn_log_filename = "./l7vsd_conn.log"
-l7vsd_conn_rotation = "size"
-l7vsd_conn_max_backup_index = "10"
-l7vsd_conn_max_filesize = "10M"
-
-# l7vsd log categories level
-l7vsd_network                  = "info"
-l7vsd_network_bandwidth                = "info"
-l7vsd_network_num_connection   = "info"
-l7vsd_network_qos              = "info"
-l7vsd_network_access           = "info"
-l7vsd_mainthread               = "info"
-l7vsd_virtualservice           = "info"
-l7vsd_virtualservice_thread            = "info"
-l7vsd_session          = "info"
-l7vsd_session_thread           = "info"
-l7vsd_realserver               = "info"
-l7vsd_sorryserver              = "info"
-l7vsd_replication              = "info"
-l7vsd_replication_sendthread           = "info"
-l7vsd_command          = "info"
-l7vsd_startstop                = "info"
-l7vsd_system                   = "info"
-l7vsd_system_memory            = "info"
-l7vsd_system_socket            = "info"
-l7vsd_system_signal            = "info"
-l7vsd_system_enviroment                = "info"
-l7vsd_system_endpoint          = "info"
-l7vsd_logger                   = "info"
-l7vsd_parameter                        = "info"
-l7vsd_event                    = "info"
-l7vsd_program                  = "info"
-l7vsd_module                   = "info"
-l7vsd_protocol                 = "info"
-l7vsd_schedule                 = "info"
-
-# l7vsadm log file base name
-l7vsadm_log_filename = "/var/log/l7vs/l7vsadm.log"
-# l7vsadm rotate pattern
-l7vsadm_rotation = "date"
-# l7vsadm rotate max backup number
-l7vsadm_max_backup_index = "10"
-# l7vsadm rotate timing ( every month rotate )
-l7vsadm_rotation_timing = "month"
-# l7vsadm rotate timing ( day and time )
-l7vsadm_rotation_timing_value = "1 0:01"
-
-# l7vsadm log categories level
-l7vsadm_parse                  = "info"
-l7vsadm_operate                        = "info"
-l7vsadm_communicate            = "info"
-l7vsadm_config_result          = "info"
-l7vsadm_common                 = "info"
-l7vsadm_logger                 = "info"
-l7vsadm_parameter              = "info"
-l7vsadm_module                 = "info"
-l7vsadm_protocol               = "info"
-l7vsadm_schedule                       = "info"
-
-# snmpagent log file base name
-snmpagent_log_filename = "/var/log/l7vs/snmpagent.log"
-# snmpagent log rotate pattern
-snmpagent_rotation = "datesize"
-# snmpagent log rotate max backup num
-snmpagent_max_backup_index = "10"
-# snmpagent max logfile size
-snmpagent_max_filesize = "30M"
-# snmpagent log rotate timing ( every week )
-snmpagent_rotation_timing = "week"
-# snmpagent log rotate timing ( a day of week and time )
-snmpagent_rotation_timing_value = "wed 23:59"
-
-# snmpagent log categories level
-snmpagent_start_stop           = "info"
-snmpagent_manager_receive      = "info"
-snmpagent_manager_send         = "info"
-snmpagent_l7vsd_receive                = "info"
-snmpagent_l7vsd_send           = "info"
-snmpagent_logger               = "info"
-snmpagent_parameter            = "info"
-
-#
-# l7vsadm setting
-#
-[l7vsadm]
-cmd_interval = 1
-cmd_count = 10
-con_interval = 1
-con_count = 10
-
-
-#
-# l7vsd replication setting
-#
-[replication]
-ip_addr = "192.168.0.20"
-service_name = "40000"
-nic = "eth1"
-interval = 1000
-compulsorily_interval = 40
-
-cmponent_id_00 = "virtualservice"
-cmponent_size_00 = 64
-cmponent_id_01 = "chash"
-cmponent_size_01 = 1
-cmponent_id_02 = "sslid"
-cmponent_size_02 = 200
-
-#
-# snmpagent settings
-#
-[snmpagent]
-nic = "eth0"
-ip_addr = "172.0.0.1"
-port = 60162
-interval = 1000
-status = 0
index 8c18c63..bd0d124 100644 (file)
@@ -5,7 +5,7 @@
 #
 TARGET         = command_thread
 CPP                    = g++
-CPPFLAGS       = -Wall -O0 -g -Werror -pthread -D PARAMETER_FILE='"./sample.ini"'
+CPPFLAGS       = -Wall -O0 -g -Werror -pthread -D PARAMETER_FILE='"./l7vs.cf"'
 INCLUDES       =       -I../../logger \
                                -I../../parameter \
                                -I../../include
@@ -56,4 +56,4 @@ $(LOGGER):    $(LOGGER_OBJS)
        $(AR) $(ARFLAGS) $@ $(LOGGER_OBJS)
 
 clean:
-       rm -f $(TARGET) $(OBJS) $(PARAMETER) $(PARAMETER_OBJS) $(LOGGER) $(LOGGER_OBJS)
+       rm -f $(TARGET) $(OBJS) $(PARAMETER) $(PARAMETER_OBJS) $(LOGGER) $(LOGGER_OBJS) *.log*
diff --git a/unit_tests/command_thread_test/l7vs.cf b/unit_tests/command_thread_test/l7vs.cf
new file mode 100644 (file)
index 0000000..b54f5d7
--- /dev/null
@@ -0,0 +1,210 @@
+#
+# UltraMonkey - L7 configuration file
+# 2008-2009 (C) NTT Comware
+# License: GNU General Public License (GPL)
+#
+#
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program 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
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA
+# 
+#
+# Rivision History.
+#      3.0.0   MultiThread version release.
+#      1.2.0   First verion release.(version was put together l7vsd)
+#              - 2008/03/26 Norihisa Nakai.
+
+
+#
+# l7vs log setting
+#
+[logger]
+# l7vsd logfile base name
+l7vsd_log_filename = "l7vsd.log"
+# l7vsd log rotate pattern
+l7vsd_rotation = "size"
+# l7vsd rotate max backup number
+l7vsd_max_backup_index = "10"
+# l7vsd rotate file size
+l7vsd_max_filesize = "10M"
+
+# l7vsd connection logfile base name
+l7vsd_conn_log_filename = "l7vsd_conn.log"
+# l7vsd connection log rotate pattern
+l7vsd_conn_rotation = "size"
+# l7vsd connection rotate max backup number
+l7vsd_conn_max_backup_index = "10"
+# l7vsd connection rotate file size
+l7vsd_conn_max_filesize = "10M"
+
+# l7vsd log categories level
+l7vsd_network                                  = "info"
+l7vsd_network_qos                              = "info"
+l7vsd_network_bandwidth                        = "info"
+l7vsd_network_num_connection   = "info"
+l7vsd_network_access                   = "info"
+l7vsd_mainthread                               = "info"
+l7vsd_virtualservice                   = "info"
+l7vsd_virtualservice_thread            = "info"
+l7vsd_session                                  = "info"
+l7vsd_session_thread                   = "info"
+l7vsd_realserver                               = "info"
+l7vsd_sorryserver                              = "info"
+l7vsd_module                                   = "info"
+l7vsd_replication                              = "info"
+l7vsd_replication_sendthread   = "info"
+l7vsd_parameter                                        = "info"
+l7vsd_logger                                   = "info"
+l7vsd_command                                  = "debug"
+l7vsd_start_stop                               = "info"
+l7vsd_system                                   = "info"
+l7vsd_system_memory                            = "info"
+l7vsd_system_endpoint                  = "info"
+l7vsd_system_signal                            = "info"
+l7vsd_system_environment               = "info"
+l7vsd_snmpbridge                               = "info"
+
+l7vsd_protocol                                 = "info"
+l7vsd_schedule                                 = "info"
+
+# l7vsadm log file base name
+l7vsadm_log_filename = "l7vsadm.log"
+# l7vsadm rotate pattern
+l7vsadm_rotation = "date"
+# l7vsadm rotate max backup number
+l7vsadm_max_backup_index = "10"
+# l7vsadm rotate timing ( every month rotate )
+l7vsadm_rotation_timing = "month"
+# l7vsadm rotate timing ( day and time )
+l7vsadm_rotation_timing_value = "1 0:01"
+
+# l7vsadm log categories level
+l7vsadm_parse                  = "info"
+l7vsadm_operate                        = "info"
+l7vsadm_config_result  = "info"
+l7vsadm_common                 = "info"
+l7vsadm_logger                 = "info"
+l7vsadm_parameter              = "info"
+l7vsadm_module                 = "info"
+
+l7vsadm_protocol               = "info"
+l7vsadm_schedule               = "info"
+
+# snmpagent log file base name
+snmp_log_filename = "snmpagent.log"
+# snmpagent log rotate pattern
+snmp_rotation = "datesize"
+# snmpagent log rotate max backup num
+snmp_max_backup_index = "10"
+# snmpagent max logfile size
+snmp_max_filesize = "30M"
+# snmpagent log rotate timing ( every week )
+snmp_rotation_timing = "week"
+# snmpagent log rotate timing ( a day of week and time )
+snmp_rotation_timing_value = "wed 23:59"
+
+# snmpagent connection log file base name
+snmp_conn_log_filename = "snmpagent.log"
+# snmpagent connection log rotate pattern
+snmp_conn_rotation = "datesize"
+# snmpagent connection log rotate max backup num
+snmp_conn_max_backup_index = "10"
+# snmpagent connection max logfile size
+snmp_conn_max_filesize = "30M"
+# snmpagent connection log rotate timing ( every week )
+snmp_conn_rotation_timing = "week"
+# snmpagent connection log rotate timing ( a day of week and time )
+snmp_conn_rotation_timing_value = "wed 23:59"
+
+# snmpagent log categories level
+snmpagent_start_stop                   = "info"
+snmpagent_manager_receive              = "info"
+snmpagent_manager_send                 = "info"
+snmpagent_l7vsd_receive                        = "info"
+snmpagent_l7vsd_send                   = "info"
+snmpagent_logger                               = "info"
+snmpagent_parameter                            = "info"
+snmpagent_system                               = "info"
+snmpagent_system_memory                        = "info"
+snmpagent_system_endpoint              = "info"
+snmpagent_system_signal                        = "info"
+snmpagent_system_environment   = "info"
+
+# sslproxy logfile base name
+sslproxy_log_filename = "sslproxy.log"
+# sslproxy log rotate pattern
+sslproxy_rotation = "size"
+# sslproxy rotate max backup number
+sslproxy_max_backup_index = "10"
+# sslproxy rotate file size
+sslproxy_max_filesize = "10M"
+
+# sslproxy connection logfile base name
+sslproxy_conn_log_filename = "sslproxy_conn.log"
+# sslproxy connection log rotate pattern
+sslproxy_conn_rotation = "size"
+# sslproxy connection rotate max backup number
+sslproxy_conn_max_backup_index = "10"
+# sslproxy connection rotate file size
+sslproxy_conn_max_filesize = "10M"
+
+# l7vsadm log categories level
+sslproxy_logger                        = "info"
+sslproxy_parameter             = "info"
+sslproxy_common                        = "info"
+sslproxy_server                        = "info"
+sslproxy_session               = "info"
+sslproxy_connection            = "info"
+
+[virtualservice]
+session_thread_pool_size       = 256
+throughput_calc_interval       = 500
+
+#
+# l7vsadm setting
+#
+[l7vsadm]
+cmd_interval = 1
+cmd_count = 10
+con_interval = 1
+con_count = 10
+
+
+#
+# l7vsd replication setting
+#
+[replication]
+#ip_addr = "192.168.0.254"
+#service_name = "40000"
+#nic = "eth0"
+#interval = 1000
+#compulsorily_interval = 40
+
+#cmponent_id_00 = "virtualservice"
+#cmponent_size_00 = 64
+#cmponent_id_01 = "chash"
+#cmponent_size_01 = 1
+#cmponent_id_02 = "sslid"
+#cmponent_size_02 = 222
+
+#
+# snmpagent settings
+#
+[snmpagent]
+nic = "eth0"
+ip_addr = "127.0.0.1"
+port = 60162
+interval = 1000
+status = 0
diff --git a/unit_tests/command_thread_test/sample.ini b/unit_tests/command_thread_test/sample.ini
deleted file mode 100644 (file)
index ed60924..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-# UltraMonkey - L7 configuration file
-# 2008 (C) NTT Comware
-# License: GNU General Public License (GPL)
-#
-#
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-#
-# Rivision History.
-#      1.2.0   First verion release.(version was put together l7vsd)
-#              - 2008/03/26 Norihisa Nakai.
-
-
-#
-# l7vs log setting
-#
-[logger]
-# l7vsd logfile base name
-l7vsd_log_filename = "./l7vsd.log"
-# l7vsd log rotate pattern
-l7vsd_rotation = "size"
-# l7vsd rotate max backup number
-l7vsd_max_backup_index = "10"
-# l7vsd rotate file size
-l7vsd_max_filesize = "10M"
-
-l7vsd_conn_log_filename = "./l7vsd_conn.log"
-l7vsd_conn_rotation = "size"
-l7vsd_conn_max_backup_index = "10"
-l7vsd_conn_max_filesize = "10M"
-
-# l7vsd log categories level
-l7vsd_network                  = "info"
-l7vsd_network_bandwidth                = "info"
-l7vsd_network_num_connection   = "info"
-l7vsd_network_qos              = "info"
-l7vsd_network_access           = "info"
-l7vsd_mainthread               = "info"
-l7vsd_virtualservice           = "info"
-l7vsd_virtualservice_thread            = "info"
-l7vsd_session          = "info"
-l7vsd_session_thread           = "info"
-l7vsd_realserver               = "info"
-l7vsd_sorryserver              = "info"
-l7vsd_replication              = "info"
-l7vsd_replication_sendthread           = "info"
-l7vsd_command          = "info"
-l7vsd_startstop                = "info"
-l7vsd_system                   = "info"
-l7vsd_system_memory            = "info"
-l7vsd_system_socket            = "info"
-l7vsd_system_signal            = "info"
-l7vsd_system_enviroment                = "info"
-l7vsd_system_endpoint          = "info"
-l7vsd_logger                   = "info"
-l7vsd_parameter                        = "info"
-l7vsd_event                    = "info"
-l7vsd_program                  = "info"
-l7vsd_module                   = "info"
-l7vsd_protocol                 = "info"
-l7vsd_schedule                 = "info"
-
-# l7vsadm log file base name
-l7vsadm_log_filename = "/var/log/l7vs/l7vsadm.log"
-# l7vsadm rotate pattern
-l7vsadm_rotation = "date"
-# l7vsadm rotate max backup number
-l7vsadm_max_backup_index = "10"
-# l7vsadm rotate timing ( every month rotate )
-l7vsadm_rotation_timing = "month"
-# l7vsadm rotate timing ( day and time )
-l7vsadm_rotation_timing_value = "1 0:01"
-
-# l7vsadm log categories level
-l7vsadm_parse                  = "info"
-l7vsadm_operate                        = "info"
-l7vsadm_communicate            = "info"
-l7vsadm_config_result          = "info"
-l7vsadm_common                 = "info"
-l7vsadm_logger                 = "info"
-l7vsadm_parameter              = "info"
-l7vsadm_module                 = "info"
-l7vsadm_protocol               = "info"
-l7vsadm_schedule                       = "info"
-
-# snmpagent log file base name
-snmpagent_log_filename = "/var/log/l7vs/snmpagent.log"
-# snmpagent log rotate pattern
-snmpagent_rotation = "datesize"
-# snmpagent log rotate max backup num
-snmpagent_max_backup_index = "10"
-# snmpagent max logfile size
-snmpagent_max_filesize = "30M"
-# snmpagent log rotate timing ( every week )
-snmpagent_rotation_timing = "week"
-# snmpagent log rotate timing ( a day of week and time )
-snmpagent_rotation_timing_value = "wed 23:59"
-
-# snmpagent log categories level
-snmpagent_start_stop           = "info"
-snmpagent_manager_receive      = "info"
-snmpagent_manager_send         = "info"
-snmpagent_l7vsd_receive                = "info"
-snmpagent_l7vsd_send           = "info"
-snmpagent_logger               = "info"
-snmpagent_parameter            = "info"
-
-#
-# l7vsadm setting
-#
-[l7vsadm]
-cmd_interval = 1
-cmd_count = 10
-con_interval = 1
-con_count = 10
-
-
-#
-# l7vsd replication setting
-#
-[replication]
-ip_addr = "192.168.0.20"
-service_name = "40000"
-nic = "eth1"
-interval = 1000
-compulsorily_interval = 40
-
-cmponent_id_00 = "virtualservice"
-cmponent_size_00 = 64
-cmponent_id_01 = "chash"
-cmponent_size_01 = 1
-cmponent_id_02 = "sslid"
-cmponent_size_02 = 200
-
-#
-# snmpagent settings
-#
-[snmpagent]
-nic = "eth0"
-ip_addr = "172.0.0.1"
-port = 60162
-interval = 1000
-status = 0