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;
}
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;
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;
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" );
}
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)
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)