2009/12/13 一時更新

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

diff --git a/l7directord/l7directord b/l7directord/l7directord
index 80eef57..80639bc 100644 (file)
--- a/l7directord/l7directord
+++ b/l7directord/l7directord
@@ -1197,7 +1197,6 @@ sub parse_real {
                          (\S+)               #  receive"
                       )?                     # (optional)
                       $/ix) {
-       print "real:" . $real. "\n";
         config_error($line, 'ERR0114', $config_line);
     }
     my ($ip1, $ip2, $port, $forward, $weight, $request, $receive)
@@ -2710,7 +2709,7 @@ sub check_connect {
     my $sock = ld_open_socket( $r->{server}{ip}, $port, $v->{protocol}, $v->{checktimeout} );
     if (!defined $sock) {
         ld_log( _message('WRN3201', $ERRNO, $r->{server}{ip}, $port) ) if (!defined $status || $status eq $SERVICE_UP);
-sleep 1;
+
         return $SERVICE_DOWN;
     }
     close($sock);

diff --git a/l7directord/t/10_startstop.t b/l7directord/t/10_startstop.t
index 7aea12e..2272fa5 100644 (file)
--- a/l7directord/t/10_startstop.t
+++ b/l7directord/t/10_startstop.t
@@ -52,7 +52,18 @@ our @ld_delete_real_returns = ();
 }
 {
     set_default();
-    local @ld_read_l7vsadm_returns = ( {} );
+    local @ld_read_l7vsadm_returns = ( {
+        'tcp:[2001::1]:8080:sessionless' => {
+            '192.168.0.2:80' => {
+                server => { ip => '192.168.0.2', port => 80 },
+                weight => 1,
+                forward => 'Masq',
+                option => { flags => '-r 192.168.0.2:80',
+                            forward => '-m' },
+            },
+            'other_virtual_option' => ' none none none none',
+        },
+                                       } );
     local @get_virtual_id_str_returns = ();
     $main::CONFIG{virtual} = [ { protocol => 'tcp' } ];
     my %expected = %main::GLOBAL;