From: takamaru <takamaru@1ed66053-1c2d-0410-8867-f7571e6e31d3>
Date: Thu, 17 Dec 2009 06:56:36 +0000 (+0000)
Subject: logrotate オプションを保存するように修正
X-Git-Tag: v3.0.1~6^2~221^2~137
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c9d86d366d9e37e69a5567f714b889b164f664b8;p=ultramonkey-l7%2Fultramonkey-l7-v3.git

logrotate オプションを保存するように修正


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

diff --git a/l7vsd/src/l7vsadm.cpp b/l7vsd/src/l7vsadm.cpp
index 1d43120b..7339fa4d 100644
--- a/l7vsd/src/l7vsadm.cpp
+++ b/l7vsd/src/l7vsadm.cpp
@@ -817,9 +817,12 @@ bool    l7vs::l7vsadm::parse_opt_vs_access_log_logrotate_func( int& pos, int arg
     
     request.vs_element.access_log_file_name = access_log_file_name;
     request.vs_element.access_log_rotate_arguments.clear();
+    request.vs_element.access_log_rotate_key_info = "";
     BOOST_FOREACH( virtualservice_element::access_log_rotate_arguments_pair_type pair, arguments_map ){
         request.vs_element.access_log_rotate_arguments.insert( pair );
+        request.vs_element.access_log_rotate_key_info += pair.first + " " + pair.second + " ";
     }
+    boost::algorithm::erase_last( request.vs_element.access_log_rotate_key_info , " " );
 
     return true;
 }
@@ -1640,7 +1643,8 @@ void    l7vs::l7vsadm::disp_list_key(){
         buf << boost::format( "    %d\n" ) % vse.access_log_flag;
         buf << boost::format( "    %s\n" )
             % ( ( 0 == vse.access_log_file_name.length() ) ? "none": vse.access_log_file_name );
-        buf << boost::format( "    %s\n" ) % vse.access_log_rotate_key_info;
+        buf << boost::format( "    %s\n" )
+            % ( ( 0 == vse.access_log_rotate_key_info.length() ) ? "none" :  vse.access_log_rotate_key_info );
         
         BOOST_FOREACH( realserver_element rse, vse.realserver_vector ){
             std::string    rsepstr;
@@ -1751,7 +1755,8 @@ void    l7vs::l7vsadm::disp_list_verbose(){
         buf << boost::format( "    %d\n" ) % vse.access_log_flag;
         buf << boost::format( "    %s\n" )
             % ( ( 0 == vse.access_log_file_name.length() ) ? "none": vse.access_log_file_name );
-        buf << boost::format( "    %s\n" ) % vse.access_log_rotate_verbose_info;
+        buf << boost::format( "    %s\n" )
+            % ( ( 0 == vse.access_log_rotate_verbose_info.length() ) ? "none" :  vse.access_log_rotate_verbose_info );
 
         BOOST_FOREACH( realserver_element rse, vse.realserver_vector ){
             std::string    rsepstr;
diff --git a/l7vsd/unit_tests/l7vsadm_test/l7vsadm_test.cpp b/l7vsd/unit_tests/l7vsadm_test/l7vsadm_test.cpp
index 627e1ae1..aebe96ad 100644
--- a/l7vsd/unit_tests/l7vsadm_test/l7vsadm_test.cpp
+++ b/l7vsd/unit_tests/l7vsadm_test/l7vsadm_test.cpp
@@ -1671,6 +1671,8 @@ void    parse_opt_vs_access_log_logrotate_func_test(){
         std::map< std::string, std::string >::iterator it =  adm.get_request().vs_element.access_log_rotate_arguments.find("--option");
         BOOST_CHECK( it != adm.get_request().vs_element.access_log_rotate_arguments.end() );
         BOOST_CHECK( it->second == "zzz" );
+        // unit_test[xx] parse_opt_vs_access_log_logrotate_func normal case 1 rotate argument atring check
+        BOOST_CHECK_EQUAL( adm.get_request().vs_element.access_log_rotate_key_info, "--option zzz" );
     }
 
 
@@ -1695,6 +1697,8 @@ void    parse_opt_vs_access_log_logrotate_func_test(){
         std::map< std::string, std::string >::iterator it =  adm.get_request().vs_element.access_log_rotate_arguments.find("--option");
         BOOST_CHECK( it != adm.get_request().vs_element.access_log_rotate_arguments.end() );
         BOOST_CHECK( it->second == "zzz" );
+        // unit_test[xx] parse_opt_vs_access_log_logrotate_func normal case 2 rotate argument atring check
+        BOOST_CHECK_EQUAL( adm.get_request().vs_element.access_log_rotate_key_info, "--option zzz" );
     }
 
     // parse_opt_vs_access_log_logrotate_func normal case 3 (no rotate arg)
@@ -1714,6 +1718,8 @@ void    parse_opt_vs_access_log_logrotate_func_test(){
         BOOST_CHECK_EQUAL( l7vs::logger_access_manager::access_log_logrotate_parameter_check_called, false );
         // unit_test[xx] parse_opt_vs_access_log_logrotate_func normal case 3 access log file name check
         BOOST_CHECK_EQUAL( adm.get_request().vs_element.access_log_file_name, "/var/log/l7vs/access.log" );
+        // unit_test[xx] parse_opt_vs_access_log_logrotate_func normal case 3 rotate argument atring check
+        BOOST_CHECK_EQUAL( adm.get_request().vs_element.access_log_rotate_key_info, "" );
     }
 
     // parse_opt_access_log_logrotate_func error case 1 (no access_log_file name)