OSDN Git Service

Add UT make file...
author0809216 <0809216@1ed66053-1c2d-0410-8867-f7571e6e31d3>
Thu, 19 Aug 2010 09:43:14 +0000 (09:43 +0000)
committer0809216 <0809216@1ed66053-1c2d-0410-8867-f7571e6e31d3>
Thu, 19 Aug 2010 09:43:14 +0000 (09:43 +0000)
git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10226 1ed66053-1c2d-0410-8867-f7571e6e31d3

18 files changed:
l7vsd/unit_tests/Makefile [new file with mode: 0644]
l7vsd/unit_tests/l7vs_logger/Makefile [new file with mode: 0644]
l7vsd/unit_tests/l7vs_logger/Makefile_logger_ma_ac
l7vsd/unit_tests/l7vsadm_test/Makefile
l7vsd/unit_tests/module_controls_test/Makefile [new file with mode: 0644]
l7vsd/unit_tests/module_test/Makefile [new file with mode: 0644]
l7vsd/unit_tests/parameter_test/Makefile
l7vsd/unit_tests/session_test/Makefile [new file with mode: 0644]
l7vsd/unit_tests/session_test/tcp_session/tcp_session_test.cpp
l7vsd/unit_tests/session_test/tcp_socket/tcp_socket_test.cpp
l7vsd/unit_tests/session_test/tcp_ssl_socket/tcp_ssl_socket_test.cpp
l7vsd/unit_tests/session_thread_control_test/Makefile
l7vsd/unit_tests/ut_run.sh [new file with mode: 0755]
l7vsd/unit_tests/virtualservice_test/Makefile
l7vsd/unit_tests/virtualservice_test/l7vs.cf [new file with mode: 0644]
l7vsd/unit_tests/virtualservice_test/stub.cpp
l7vsd/unit_tests/virtualservice_test/vs_tcp_it_ut.cpp
l7vsd/unit_tests/virtualservice_test/vs_tcp_test.cpp

diff --git a/l7vsd/unit_tests/Makefile b/l7vsd/unit_tests/Makefile
new file mode 100644 (file)
index 0000000..508c890
--- /dev/null
@@ -0,0 +1,43 @@
+ALL:
+       $(MAKE) -C command_receiver_test
+       $(MAKE) -C command_session_test
+       $(MAKE) -C command_thread_test
+       $(MAKE) -C endpoint_test
+       $(MAKE) -C l7vs_command_test
+       $(MAKE) -C l7vs_logger
+       $(MAKE) -C l7vsadm_test
+       $(MAKE) -C l7vsd_test
+       $(MAKE) -C logger_implement_access
+       $(MAKE) -C module_controls_test
+       $(MAKE) -C module_test
+       $(MAKE) -C other
+       $(MAKE) -C parameter_test
+       $(MAKE) -C realserver_test
+       $(MAKE) -C replication_test
+       $(MAKE) -C schedule_module_test
+       $(MAKE) -C session_test
+#      $(MAKE) -C session_thread_control_test
+       $(MAKE) -C virtualservice_element_test
+       $(MAKE) -C virtualservice_test
+
+clean:
+       $(MAKE) -C command_receiver_test clean
+       $(MAKE) -C command_session_test clean
+       $(MAKE) -C command_thread_test clean
+       $(MAKE) -C endpoint_test clean
+       $(MAKE) -C l7vs_command_test clean
+       $(MAKE) -C l7vs_logger clean
+       $(MAKE) -C l7vsadm_test clean
+       $(MAKE) -C l7vsd_test clean
+       $(MAKE) -C logger_implement_access clean
+       $(MAKE) -C module_controls_test clean
+       $(MAKE) -C module_test clean
+       $(MAKE) -C other clean
+       $(MAKE) -C parameter_test clean
+       $(MAKE) -C realserver_test clean
+       $(MAKE) -C replication_test clean
+       $(MAKE) -C schedule_module_test clean
+       $(MAKE) -C session_test clean
+#      $(MAKE) -C session_thread_control_test clean
+       $(MAKE) -C virtualservice_element_test clean
+       $(MAKE) -C virtualservice_test clean
diff --git a/l7vsd/unit_tests/l7vs_logger/Makefile b/l7vsd/unit_tests/l7vs_logger/Makefile
new file mode 100644 (file)
index 0000000..5e2a146
--- /dev/null
@@ -0,0 +1,9 @@
+ALL:
+       $(MAKE) -f Makefile_logger_impl
+       $(MAKE) -f Makefile_logger_ma_ac
+       $(MAKE) -f Makefile_logger_ut
+
+clean:
+       $(MAKE) -f Makefile_logger_impl clean
+       $(MAKE) -f Makefile_logger_ma_ac clean
+       $(MAKE) -f Makefile_logger_ut clean
index a9549c7..6e286ab 100644 (file)
@@ -58,5 +58,5 @@ logger_access_manager_test.o: $(SRCDIR)/logger_access_manager.cpp
 
 clean:
        rm -f $(TARGET) *.o
-#      $(MAKE) -C $(PARAMETERDIR) clean
-#      $(MAKE) -C $(PARAMETERDIR2) clean
+       $(MAKE) -C $(PARAMETERDIR) clean
+       $(MAKE) -C $(PARAMETERDIR2) clean
index cbef08d..733357b 100644 (file)
@@ -7,7 +7,7 @@ TARGET          = l7vsadm_ut
 CPP                    = g++
 CPPFLAGS       = -Wall -O0 -g -Wno-write-strings -Werror -pthread -DPARAMETER_FILE='"./l7vs.cf"' -DLOGGER_PROCESS_ADM -DL7VS_CONFIG_SOCK_PATH='"."' -DMAX_BUFFER_SIZE='(65535)' -DVERSION=\"3.0.0-0\"
 INCLUDES       =       -I../../include -I../../..
-LIBS           =       -lboost_system \
+LIBS           =       -lboost_system-mt \
                                -lboost_thread-mt \
                                -lboost_serialization-mt \
                                -lboost_unit_test_framework-mt \
@@ -44,6 +44,8 @@ OBJS          = $(SRCS:.cpp=.o)
 PARAMETER_OBJS = $(PARAMETER_SRCS:.cpp=.o)
 LOGGER_OBJS    = $(LOGGER_SRCS:.cpp=.o)
 
+LOGFILES       = l7vsadm.log l7vsd.log
+
 all:   $(TARGET)
 
 $(TARGET):     $(OBJS) $(PARAMETER) $(LOGGER)
@@ -56,5 +58,5 @@ $(LOGGER):    $(LOGGER_OBJS)
        $(AR) $(ARFLAGS) $@ $(LOGGER_OBJS)
 
 clean:
-       rm -f $(TARGET) $(OBJS) $(PARAMETER) $(PARAMETER_OBJS) $(LOGGER) $(LOGGER_OBJS) l7vsadm.log
+       rm -f $(TARGET) $(OBJS) $(PARAMETER) $(PARAMETER_OBJS) $(LOGGER) $(LOGGER_OBJS) $(LOGFILES)
 
diff --git a/l7vsd/unit_tests/module_controls_test/Makefile b/l7vsd/unit_tests/module_controls_test/Makefile
new file mode 100644 (file)
index 0000000..543a375
--- /dev/null
@@ -0,0 +1,7 @@
+ALL:
+       $(MAKE) -C protocol_module_control
+       $(MAKE) -C schedule_module_control
+
+clean:
+       $(MAKE) -C protocol_module_control clean
+       $(MAKE) -C schedule_module_control clean
diff --git a/l7vsd/unit_tests/module_test/Makefile b/l7vsd/unit_tests/module_test/Makefile
new file mode 100644 (file)
index 0000000..3ee220d
--- /dev/null
@@ -0,0 +1,19 @@
+ALL:
+       $(MAKE) -C http_protocol_module_base_test
+       $(MAKE) -C http_utility_test
+       $(MAKE) -C module_base_test
+       $(MAKE) -C protocol_module_base_test
+       $(MAKE) -C protocol_module_ip_test
+       $(MAKE) -C protocol_module_sessionless_test
+       $(MAKE) -C protocol_module_sslid_test
+       $(MAKE) -C ssl_protocol_module_base_test
+
+clean:
+       $(MAKE) -C http_protocol_module_base_test clean
+       $(MAKE) -C http_utility_test clean
+       $(MAKE) -C module_base_test clean
+       $(MAKE) -C protocol_module_base_test clean
+       $(MAKE) -C protocol_module_ip_test clean
+       $(MAKE) -C protocol_module_sessionless_test clean
+       $(MAKE) -C protocol_module_sslid_test clean
+       $(MAKE) -C ssl_protocol_module_base_test clean
index 3daee8e..fd81fe0 100644 (file)
@@ -24,11 +24,15 @@ SRCS1               =       parameter_test.cpp
 SRCS2          =       parameter_impl_test.cpp
 SRCS3          =       parameter_impl_thread_test.cpp
 
+LOGGER         =       liblogger.a
+LOGGERDIR      =       logger_stub
+LOGFILES       =       parameter_test.log
+
 OBJS1          = $(SRCS1:.cpp=.o)
 OBJS2          = $(SRCS2:.cpp=.o)
 OBJS3          = $(SRCS3:.cpp=.o)
 
-all:   $(TARGET1) $(TARGET2) $(TARGET3)
+all:   $(LOGGER) $(TARGET1) $(TARGET2) $(TARGET3)
 
 $(TARGET1):    $(OBJS1) 
        $(CPP) $(CPPFLAGS) $(INCLUDES) $(LDFLAGS) -o $@ $(OBJS1) $(LIBS)
@@ -38,8 +42,13 @@ $(TARGET2):  $(OBJS2)
 
 $(TARGET3): $(OBJS3)
        $(CPP) $(CPPFLAGS) $(INCLUDES) $(LDFLAGS) -o $@ $(OBJS3) $(LIBS)
+
+$(LOGGER):
+       $(MAKE) -C $(LOGGERDIR)
+
 clean:
-       rm -f $(TARGET1) $(OBJS1) $(TARGET2) $(OBJS2) $(TARGET3) $(OBJS3) sample.ini
+       rm -f $(TARGET1) $(OBJS1) $(TARGET2) $(OBJS2) $(TARGET3) $(OBJS3) sample.ini $(LOGFILES)
+       $(MAKE) -C $(LOGGERDIR) clean
 
 .cpp.o:
        $(CPP) $(CPPFLAGS) $(INCLUDES) -c $<
diff --git a/l7vsd/unit_tests/session_test/Makefile b/l7vsd/unit_tests/session_test/Makefile
new file mode 100644 (file)
index 0000000..8c66f5b
--- /dev/null
@@ -0,0 +1,19 @@
+ALL:
+       $(MAKE) -C session_result_message
+       $(MAKE) -C tcp_data_test
+       $(MAKE) -C tcp_realserver_connect_socket_list
+       $(MAKE) -C tcp_session
+       $(MAKE) -C tcp_socket
+       $(MAKE) -C tcp_ssl_socket
+       $(MAKE) -C tcp_thread_message
+       $(MAKE) -C udp_data_test
+
+clean:
+       $(MAKE) -C session_result_message clean
+       $(MAKE) -C tcp_data_test clean
+       $(MAKE) -C tcp_realserver_connect_socket_list clean
+       $(MAKE) -C tcp_session clean
+       $(MAKE) -C tcp_socket clean
+       $(MAKE) -C tcp_ssl_socket clean
+       $(MAKE) -C tcp_thread_message clean
+       $(MAKE) -C udp_data_test clean
index 63e0257..2bcc424 100644 (file)
@@ -13216,7 +13216,7 @@ void initialize_ssl_mode_test(){
     bool set_ssl_cache_flag2(false);
     initialize_ssl_mode_test_class test_obj2(vs,io,set_option,listen_endpoint,set_mode,set_context2,set_ssl_cache_flag2,set_ssl_handshake_time_out,plogger);
 
-    const SSL_METHOD* pRet = test_obj2.get_client_ssl_socket().impl()->ssl->method;
+    SSL_METHOD* pRet = test_obj2.get_client_ssl_socket().impl()->ssl->method;
     test_obj2.get_client_ssl_socket().impl()->ssl->method = NULL;
 
 
index a9ab082..9379c26 100644 (file)
@@ -317,9 +317,9 @@ void accept_test(){
     // unit_test [4] accept test set socket option TCP_CORK
     std::cout << "[4] accept test set socket option TCP_CORK" << std::endl;
     int val;
-    size_t len = sizeof(val);
-    boost::asio::detail::socket_ops::getsockopt(test_obj.get_socket_pointer()->native(),IPPROTO_TCP,TCP_CORK,&val,&len,ec);
-    BOOST_CHECK(!ec);
+    socklen_t len = sizeof(val);
+    int err = ::getsockopt(test_obj.get_socket_pointer()->native(),IPPROTO_TCP,TCP_CORK,&val,&len);
+    BOOST_CHECK(!err);
     BOOST_CHECK((bool)val == set_option.cork_val);
 
     test_obj.test_close(ec);
@@ -395,9 +395,9 @@ void connect_test(){
     // unit_test [4] connect test set socket option TCP_CORK
     std::cout << "[4] connect test set socket option TCP_CORK" << std::endl;
     int val;
-    size_t len = sizeof(val);
-    boost::asio::detail::socket_ops::getsockopt(test_obj.get_socket_pointer()->native(),IPPROTO_TCP,TCP_CORK,&val,&len,ec);
-    BOOST_CHECK(!ec);
+    socklen_t len = sizeof(val);
+    int err = ::getsockopt(test_obj.get_socket_pointer()->native(),IPPROTO_TCP,TCP_CORK,&val,&len);
+    BOOST_CHECK(!err);
     BOOST_CHECK((bool)val == set_option.cork_val);
     
     
index c5c57a6..e4d68c3 100644 (file)
@@ -452,20 +452,20 @@ void accept_test(){
     boost::asio::ssl::stream<boost::asio::ip::tcp::socket>* pSocket = test_obj.get_socket_pointer();
 
     int val;
-    size_t len;
+    socklen_t len;
 
     // unit_test [2] accept test set TCP_CORK check
     std::cout << "[2] accept test set TCP_CORK check" << std::endl;
     val = 0;
     len = sizeof(val);
-    boost::asio::detail::socket_ops::getsockopt(pSocket->lowest_layer().native(),IPPROTO_TCP,TCP_CORK,&val,&len,ec);
+    ::getsockopt(pSocket->lowest_layer().native(),IPPROTO_TCP,TCP_CORK,&val,&len);
     BOOST_CHECK_EQUAL(val,1);
 
     // unit_test [3] accept test set TCP_NODELAY check
     std::cout << "[3] accept test set TCP_NODELAY check" << std::endl;
     val = 0;
     len = sizeof(val);
-    boost::asio::detail::socket_ops::getsockopt(pSocket->lowest_layer().native(),IPPROTO_TCP,TCP_NODELAY,&val,&len,ec);
+    ::getsockopt(pSocket->lowest_layer().native(),IPPROTO_TCP,TCP_NODELAY,&val,&len);
     BOOST_CHECK_EQUAL(val,1);
 
     // close
index 8d191b5..311c60c 100644 (file)
@@ -6,7 +6,7 @@
 TARGET         = stc_ut
 CPP                    = g++
 CPPFLAGS       = -O0 -g -Wall -Werror -pthread -D__SNMPBRIDGE_H__ -DMAX_BUFFER_SIZE=65535
-INCLUDES       =       -I logger_stb \
+INCLUDES       =       \
                                -I./ \
                                -I../../src \
                                -I../../include \
@@ -21,7 +21,6 @@ LDFLAGS               = -lrt -ldl -lssl
 
 SRCS           =       \
                        stub.cpp \
-                       logger_stb/logger.cpp \
                        ../../src/virtualservice_base.cpp \
                        ../../src/virtualservice_tcp.cpp \
                        ../../src/virtualservice_udp.cpp \
diff --git a/l7vsd/unit_tests/ut_run.sh b/l7vsd/unit_tests/ut_run.sh
new file mode 100755 (executable)
index 0000000..03306a3
--- /dev/null
@@ -0,0 +1,72 @@
+error=
+for path in ./command_receiver_test/command_receiver_ut \
+       ./command_session_test/command_session_ut \
+       ./command_thread_test/command_thread \
+       ./endpoint_test/endpoint_ut \
+       ./l7vs_command_test/l7vs_command_ut \
+       ./l7vs_logger/logger_access_manager_test \
+       ./l7vs_logger/logger_impl_test \
+       ./l7vs_logger/logger_ut_test \
+       ./l7vsadm_test/l7vsadm_ut \
+       ./l7vsd_test/l7vsd_thread \
+       ./l7vsd_test/l7vsd_ut \
+       ./logger_implement_access/accesslog_ut \
+       ./module_controls_test/protocol_module_control/module_control_thread_ut \
+       ./module_controls_test/protocol_module_control/module_control_ut \
+       ./module_controls_test/schedule_module_control/module_control_thread_ut \
+       ./module_controls_test/schedule_module_control/module_control_ut \
+       ./module_test/http_protocol_module_base_test/http_protocol_module_base_ut \
+       ./module_test/http_utility_test/http_utility_ut \
+       ./module_test/module_base_test/module_base_ut \
+       ./module_test/protocol_module_base_test/protocol_module_base_ut \
+       ./module_test/protocol_module_ip_test/ip_ut \
+       ./module_test/protocol_module_sessionless_test/sessionless_ut \
+       ./module_test/protocol_module_sslid_test/sslid_ut \
+       ./module_test/ssl_protocol_module_base_test/sslid_ut \
+       ./other/atomic_test \
+       ./parameter_test/parameter_impl_thread_ut \
+       ./parameter_test/parameter_impl_ut \
+       ./parameter_test/parameter_ut \
+       ./realserver_test/realserver_ut \
+       ./replication_test/replication_ut \
+       ./schedule_module_test/schedule_module_lc_ut \
+       ./schedule_module_test/schedule_module_rr_ut \
+       ./schedule_module_test/schedule_module_wrr_ut \
+       ./session_test/session_result_message/session_result_message_ut \
+       ./session_test/tcp_data_test/tcp_data_ut \
+       ./session_test/tcp_realserver_connect_socket_list/tcp_realserver_connect_socket_list_test_ut \
+       ./session_test/tcp_session/tcp_session_test_ut \
+       ./session_test/tcp_socket/tcp_socket_test_ut \
+       ./session_test/tcp_ssl_socket/tcp_ssl_socket_test_ut \
+       ./session_test/tcp_thread_message/tcp_thread_message_test_ut \
+       ./session_test/udp_data_test/udp_data_ut \
+       ./virtualservice_element_test/vselement_ut \
+       ./virtualservice_test/vs_base_ut \
+       ./virtualservice_test/vs_tcp_it \
+       ./virtualservice_test/vs_tcp_sorry_ut \
+       ./virtualservice_test/vs_tcp_thread_ut \
+       ./virtualservice_test/vs_tcp_thread_ut2 \
+       ./virtualservice_test/vs_tcp_ut 
+do
+       echo "$path" | grep "$1" > /dev/null
+       if [ $? -ne 0 ]; then
+               continue
+       fi
+       
+       dir=`dirname $path`
+       file=`basename $path`
+       pushd $dir > /dev/null
+       echo "exec $path" 1>&2
+       ./$file 1>&2
+       if [ "$?" -ne 0 ]; then
+               error="${error}Error detected in $path\n"
+       fi
+       popd > /dev/null
+done
+
+if [ "$error" = "" ]; then
+       exit 0
+else
+       echo -ne $error
+       exit 1
+fi
index 1967b3c..4de8a88 100644 (file)
@@ -6,7 +6,7 @@
 TARGET         = vs_base_ut vs_tcp_ut vs_tcp_thread_ut vs_tcp_thread_ut2 vs_tcp_it vs_tcp_sorry_ut
 #TARGET                = vs_tcp_ut
 CPP                    = g++
-CPPFLAGS       = -O0 -g -Wall -Werror -pthread -DMAX_BUFFER_SIZE=65535 -DDEBUG -DPARAMETER_FILE='"../l7vs_logger/l7vs.cf"'
+CPPFLAGS       = -O0 -g -Wall -Werror -pthread -DMAX_BUFFER_SIZE=65535 -DDEBUG -DPARAMETER_FILE='"./l7vs.cf"'
 # CPPFLAGS     = -O2 -Wall -Werror -pthread -DMAX_BUFFER_SIZE=65535 -DDEBUG
 
 
@@ -139,6 +139,8 @@ ITOBJS              = $(ITSRCS:.cpp=.o)
 
 SORRYOBJS              = $(SORRYSRCS:.cpp=.o)
 
+ACCESSLOG              = access_log.log 
+
 all:   $(TARGET)
 
 vs_base_ut:    $(BASEOBJS)
@@ -163,5 +165,5 @@ vs_tcp_sorry_ut: $(SORRYOBJS)
 #      $(CPP) $(INCLUDES) -o $@ $(OBJS) $(LIBS)
 
 clean:
-       rm -f $(TARGET) $(BASEOBJS) $(TCPOBJS) $(TPCTOBJS) $(TPCT2OBJS) $(ITOBJS) $(SORRYOBJS)
+       rm -f $(TARGET) $(BASEOBJS) $(TCPOBJS) $(TPCTOBJS) $(TPCT2OBJS) $(ITOBJS) $(SORRYOBJS) $(ACCESSLOG)
 
diff --git a/l7vsd/unit_tests/virtualservice_test/l7vs.cf b/l7vsd/unit_tests/virtualservice_test/l7vs.cf
new file mode 100644 (file)
index 0000000..43353b7
--- /dev/null
@@ -0,0 +1,229 @@
+#
+# 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 = "/var/log/l7vs/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 = "/var/log/l7vs/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                                  = "info"
+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 = "/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_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 = "/var/log/l7vs/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 = "/var/log/l7vs/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 = "/var/log/l7vs/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 = "/var/log/l7vs/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"
+
+#
+# l7vsadm setting
+#
+[l7vsadm]
+cmd_interval = 1
+cmd_count = 10
+con_interval = 1
+con_count = 10
+
+#
+# l7vsd setting
+#
+[l7vsd]
+maxfileno = 65535
+task_scheduler_algorithm       = 2
+task_scheduler_priority                = 99
+
+#
+# virtualservice setting
+#
+[virtualservice]
+#nic_realserver_side                   = "eth0"
+#session_thread_pool_size      = 32
+#throughput_calc_interval      = 500
+#num_of_core_uses              = 0
+#ssl_flag                      = 1
+
+#
+# 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
+
+[session]
+upstream_buffer_size = 8192
+downstream_buffer_size = 8192
+
+
index f0009b6..917b6ef 100644 (file)
@@ -142,7 +142,7 @@ void    l7vs::Logger::putLogInfo( l7vs::LOG_CATEGORY_TAG, const unsigned int, co
 }
 
 void    l7vs::Logger::putLogDebug( l7vs::LOG_CATEGORY_TAG, const unsigned int, const std::string& msg, const char*, int ){
-    std::cout << "DEBUG : " << msg << std::endl;
+//    std::cout << "DEBUG : " << msg << std::endl;
 }
 
 l7vs::l7vsd::l7vsd(){}
@@ -304,7 +304,7 @@ l7vs::tcp_session::tcp_session(virtualservice_tcp& vs,
 
     exit_flag = false;
 //    session_pause_flag = false;
-    std::cout << "SESSION:CREATE" << std::endl;
+//    std::cout << "SESSION:CREATE" << std::endl;
 }
 
 l7vs::tcp_session::~tcp_session(void){}
index 515181a..d4e8ae4 100644 (file)
@@ -393,9 +393,9 @@ test_suite*    init_unit_test_suite( int argc, char* argv[] ){
     test_suite* ts = BOOST_TEST_SUITE( "virtualservice_tcp_test(UT for IT-bug)" );
 
     // add test case to test suite
-/*    ts->add( BOOST_TEST_CASE( &vs_tcp_test1 ) );
-    ts->add( BOOST_TEST_CASE( &vs_tcp_test2 ) );*/
-    ts->add( BOOST_TEST_CASE( &vs_tcp_test3 ) );
+//    ts->add( BOOST_TEST_CASE( &vs_tcp_test1 ) );
+    ts->add( BOOST_TEST_CASE( &vs_tcp_test2 ) );
+//    ts->add( BOOST_TEST_CASE( &vs_tcp_test3 ) );
 
     framework::master_test_suite().add( ts );
 
index 557a5aa..48b16aa 100644 (file)
@@ -141,10 +141,10 @@ std::cout << "pool_size = [" << pool_size << "]\n";
 
     // unit_test[54]  set TCP_DEFER_ACCEPT test
     int val = 0;
-    size_t len = sizeof(val);
+    socklen_t len = sizeof(val);
     boost::system::error_code ec;
-    boost::asio::detail::socket_ops::getsockopt(vs->get_acceptor().native(),IPPROTO_TCP,TCP_DEFER_ACCEPT,&val,&len,ec);
-    BOOST_CHECK(!ec);
+    int err = ::getsockopt(vs->get_acceptor().native(),IPPROTO_TCP,TCP_DEFER_ACCEPT,&val,&len);
+    BOOST_CHECK(!err);
     BOOST_CHECK(val);
     
     // unit_test[4]  stop method test
@@ -4670,10 +4670,10 @@ void    virtualservice_tcp_initialize_to_finalize(){
 
     // unit_test[156]  set TCP_DEFER_ACCEPT test
     int val = 0;
-    size_t len = sizeof(val);
+    socklen_t len = sizeof(val);
     boost::system::error_code ec;
-    boost::asio::detail::socket_ops::getsockopt(vs->get_acceptor().native(),IPPROTO_TCP,TCP_DEFER_ACCEPT,&val,&len,ec);
-    BOOST_CHECK(!ec);
+    int err = ::getsockopt(vs->get_acceptor().native(),IPPROTO_TCP,TCP_DEFER_ACCEPT,&val,&len);
+    BOOST_CHECK(!err);
     BOOST_CHECK(val);
     
     // unit_test[157]  stop method test