Ticket#427関連として、パラメータ関連の修正を実施

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

diff --git a/configure b/configure
index 2cb9dd3..a3c086e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1046,7 +1046,7 @@ Optional Packages:
                                                                default=LIBDIR/l7vs
        --with-l7vsadm-sockdir=DIR      l7vsadm sockfile PATH.
                                                                        default=/var/run/l7vs
-       --wigh-l7vs-buffer-size=NUM     l7vsd using heap buffer size.
+       --with-l7vs-buffer-size=NUM     l7vsd using heap buffer size.
                                                                        default=4096
        --with-l7vs-config-dir=DIR      l7vs configfile PATH.
                                                                        default=/etc/l7vs/l7vs.cf

diff --git a/configure.in b/configure.in
index e0c070c..78db8c5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -68,7 +68,7 @@ AC_ARG_WITH(
 
 AC_ARG_WITH(
        l7vs-buffer-size,
-       [       --wigh-l7vs-buffer-size=NUM     l7vsd using heap buffer size.
+       [       --with-l7vs-buffer-size=NUM     l7vsd using heap buffer size.
                                                                        [default=4096] ],
        [       l7vs_max_buffer_size="$withval" ],
        [       l7vs_max_buffer_size=4096 ]

diff --git a/doc/conf/l7vs.cf b/doc/conf/l7vs.cf
index 961e910..1ad428f 100644 (file)
--- a/doc/conf/l7vs.cf
+++ b/doc/conf/l7vs.cf
@@ -160,10 +160,8 @@ maxfileno = 65535
 # virtualservice setting
 #
 [virtualservice]
-nic_realserver_side         = "eth0"
 session_thread_pool_size    = 32
 throughput_calc_interval    = 500
-num_of_core_uses            = 0
 
 #
 # l7vsd replication setting

diff --git a/l7vsd/include/virtualservice.h b/l7vsd/include/virtualservice.h
index 280afac..965510c 100644 (file)
--- a/l7vsd/include/virtualservice.h
+++ b/l7vsd/include/virtualservice.h
@@ -59,6 +59,9 @@
 #define PARAM_BPS_CALC_INTERVAL    "throughput_calc_interval"
 #define PARAM_REP_INTERVAL         "interval"
 
+//! Default nic of realserver side
+#define RS_SIDE_NIC_NAME_DEFAULT   "eth0"
+
 #define PROTOMOD_NOTLOAD_ERROR_MSG "Protocol Module not loaded"
 #define SCHEDMOD_NOTLOAD_ERROR_MSG "Schedule Module not loaded"
 #define PROTOMOD_LOAD_ERROR_MSG    "Protocol Module load error"
@@ -168,7 +171,8 @@ protected:
         int         session_pool_size;
         long        bps_interval;
         long        rep_interval;
-        parameter_data() :  session_pool_size( SESSION_POOL_NUM_DEFAULT ),
+        parameter_data() :  nic_realserver_side( RS_SIDE_NIC_NAME_DEFAULT ),
+                            session_pool_size( SESSION_POOL_NUM_DEFAULT ),
                             bps_interval( BPS_INTERVAL_DEFAULT ),
                             rep_interval( REP_INTERVAL_DEFAULT ){}
     };

diff --git a/l7vsd/src/virtualservice_base.cpp b/l7vsd/src/virtualservice_base.cpp
index 337e0d5..1a1c12a 100644 (file)
--- a/l7vsd/src/virtualservice_base.cpp
+++ b/l7vsd/src/virtualservice_base.cpp
@@ -104,11 +104,8 @@ void    l7vs::virtualservice_base::load_parameter( l7vs::error_code& err ){
     std::string            str_val;
     //get realserver_side networkI/F card name
     str_val    = param.get_string( l7vs::PARAM_COMP_VIRTUALSERVICE, PARAM_RS_SIDE_NIC_NAME, vs_err );
-    if( !vs_err )
+    if( !vs_err ) {
         param_data.nic_realserver_side    = str_val;
-    else{
-        err.setter( true, "nic_realserver_side parameter does not exist." );
-        return;
     }
     //get session pool size value
     int_val    = param.get_int( l7vs::PARAM_COMP_VIRTUALSERVICE, PARAM_POOLSIZE_KEY_NAME, vs_err );