OSDN -- 開發和下載開源軟體
繁體中文翻譯狀態 translation status for zh-tw
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

提交

標籤
無標籤

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

修訂b964ff1ed52b02d77510245d4d23f3bea0f34a9f (tree)
時間2010-10-07 19:41:26
作者6638678 <6638678@1ed6...>
Commiter6638678

Log Message

bug fix

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

Change Summary

差異

--- a/test/script/l7vsadm/l7vsadm-1-2-4.sh
+++ b/test/script/l7vsadm/l7vsadm-1-2-4.sh
@@ -23,7 +23,7 @@ then
2323 exit 1
2424 fi
2525
26-if [ $((TIME1+10)) -ne $TIME2 ]
26+if [ $((TIME1+10)) -gt $TIME2 ]
2727 then
2828 echo "Test failed: flock -n -x $L7VSADM l7vsadm"
2929 exit 1
--- a/test/script/l7vsadm/l7vsadm-3-2-1.sh
+++ /dev/null
@@ -1,138 +0,0 @@
1-#!/bin/bash
2-
3-. ${SET_DEFAULT_CONF}
4-
5-#Run http server
6-RealServer1=RealServer1
7-RealServer1_ADDR=127.0.0.1
8-RealServer1_PORT=50001
9-start_lighttpd -s $RealServer1 -a $RealServer1_ADDR -p $RealServer1_PORT
10-if [ $? -ne 0 ]
11-then
12- echo "Test failed: start_lighttpd RealServer1"
13- exit 1
14-fi
15-
16-RealServer2=RealServer2
17-RealServer2_ADDR=127.0.0.1
18-RealServer2_PORT=50002
19-start_lighttpd -s $RealServer2 -a $RealServer2_ADDR -p $RealServer2_PORT
20-if [ $? -ne 0 ]
21-then
22- echo "Test failed: start_lighttpd RealServer2"
23- exit 1
24-fi
25-
26-#Add Service
27-$L7VSD
28-if [ $? -ne 0 ]
29-then
30- echo "Test failed: $L7VSD"
31- exit 1
32-fi
33-usleep 100000
34-
35-$L7VSADM -A -t localhost4:40001 -m sessionless
36-if [ $? -ne 0 ]
37-then
38- echo "Test failed: $L7VSADM -A -t localhost4:40001 -m sessionless"
39- exit 1
40-fi
41-
42-$L7VSADM -a -t localhost4:40001 -m sessionless -r localhost4:${RealServer1_PORT} -w 3
43-if [ $? -ne 0 ]
44-then
45- echo "Test failed: $L7VSADM -a -t localhost4:40001 -m sessionless -r localhost4:${RealServer1_PORT} -w 3"
46- exit 1
47-fi
48-
49-$L7VSADM -a -t localhost4:40001 -m sessionless -r localhost4:${RealServer2_PORT} -w 0
50-if [ $? -ne 0 ]
51-then
52- echo "Test failed: $L7VSADM -a -t localhost4:40001 -m sessionless -r localhost4:${RealServer2_PORT} -w 0"
53- exit 1
54-fi
55-
56-
57-RET=`$L7VSADM -V`
58-EXPECT="Layer-7 Virtual Server version 3.0.0
59-L7vsd Log Level:
60-Category Level
61-l7vsd_network warn
62-l7vsd_network_qos warn
63-l7vsd_network_bandwidth warn
64-l7vsd_network_num_connection warn
65-l7vsd_network_access warn
66-l7vsd_mainthread warn
67-l7vsd_virtualservice warn
68-l7vsd_virtualservice_thread warn
69-l7vsd_session warn
70-l7vsd_session_thread warn
71-l7vsd_realserver warn
72-l7vsd_sorryserver warn
73-l7vsd_module warn
74-l7vsd_replication warn
75-l7vsd_replication_sendthread warn
76-l7vsd_parameter warn
77-l7vsd_logger warn
78-l7vsd_command warn
79-l7vsd_start_stop warn
80-l7vsd_system warn
81-l7vsd_system_memory warn
82-l7vsd_system_endpoint warn
83-l7vsd_system_signal warn
84-l7vsd_system_environment warn
85-l7vsd_snmpbridge warn
86-l7vsd_protocol warn
87-l7vsd_schedule warn
88-
89-Replication Mode:
90-SINGLE
91-
92-SNMPAgent Connection Status:
93-non-connecting
94-
95-SNMPAgent Log Level:
96-Category Level
97-snmpagent_start_stop warn
98-snmpagent_manager_receive warn
99-snmpagent_manager_send warn
100-snmpagent_l7vsd_receive warn
101-snmpagent_l7vsd_send warn
102-snmpagent_logger warn
103-snmpagent_parameter warn
104-snmpagent_system warn
105-snmpagent_system_memory warn
106-snmpagent_system_endpoint warn
107-snmpagent_system_signal warn
108-snmpagent_system_environment warn
109-
110-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
111- SorryAddress:Port Sorry_cc Sorry_flag
112- QoS-up Throughput-up
113- QoS-down Throughput-down
114- SSL_config_file
115- Socket option
116- Access_log_flag
117- Access_log_file
118- Access_log_rotate option
119- -> RemoteAddress:Port Forward Weight ActiveConn InactConn
120-TCP localhost:40001 sessionless rr --sorry-uri '/'
121- none 0 0
122- 0 0
123- 0 0
124- none
125- none
126- 0
127- none
128- --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
129- -> localhost:50001 Masq 3 0 0
130- -> localhost:50002 Masq 0 0 0 "
131-if [ "${RET}" != "${EXPECT}" ]
132-then
133- echo "Test failed: $L7VSADM -V"
134- exit 1
135-fi
136-
137-exit 0
138-
--- a/test/script/l7vsadm/l7vsadm-3-2-2.sh
+++ /dev/null
@@ -1,138 +0,0 @@
1-#!/bin/bash
2-
3-. ${SET_DEFAULT_CONF}
4-
5-#Run http server
6-RealServer1=RealServer1
7-RealServer1_ADDR=[::1]
8-RealServer1_PORT=50001
9-start_lighttpd -s $RealServer1 -a $RealServer1_ADDR -p $RealServer1_PORT -i
10-if [ $? -ne 0 ]
11-then
12- echo "Test failed: start_lighttpd RealServer1"
13- exit 1
14-fi
15-
16-RealServer2=RealServer2
17-RealServer2_ADDR=[::1]
18-RealServer2_PORT=50002
19-start_lighttpd -s $RealServer2 -a $RealServer2_ADDR -p $RealServer2_PORT -i
20-if [ $? -ne 0 ]
21-then
22- echo "Test failed: start_lighttpd RealServer2"
23- exit 1
24-fi
25-
26-#Add Service
27-$L7VSD
28-if [ $? -ne 0 ]
29-then
30- echo "Test failed: $L7VSD"
31- exit 1
32-fi
33-usleep 100000
34-
35-$L7VSADM -A -t localhost6:40001 -m sessionless
36-if [ $? -ne 0 ]
37-then
38- echo "Test failed: $L7VSADM -A -t localhost6:40001 -m sessionless"
39- exit 1
40-fi
41-
42-$L7VSADM -a -t localhost6:40001 -m sessionless -r localhost6:${RealServer1_PORT} -w 3
43-if [ $? -ne 0 ]
44-then
45- echo "Test failed: $L7VSADM -a -t localhost6:40001 -m sessionless -r localhost6:${RealServer1_PORT} -w 3"
46- exit 1
47-fi
48-
49-$L7VSADM -a -t localhost6:40001 -m sessionless -r localhost6:${RealServer2_PORT} -w 0
50-if [ $? -ne 0 ]
51-then
52- echo "Test failed: $L7VSADM -a -t localhost6:40001 -m sessionless -r localhost6:${RealServer2_PORT} -w 0"
53- exit 1
54-fi
55-
56-
57-RET=`$L7VSADM -V`
58-EXPECT="Layer-7 Virtual Server version 3.0.0
59-L7vsd Log Level:
60-Category Level
61-l7vsd_network warn
62-l7vsd_network_qos warn
63-l7vsd_network_bandwidth warn
64-l7vsd_network_num_connection warn
65-l7vsd_network_access warn
66-l7vsd_mainthread warn
67-l7vsd_virtualservice warn
68-l7vsd_virtualservice_thread warn
69-l7vsd_session warn
70-l7vsd_session_thread warn
71-l7vsd_realserver warn
72-l7vsd_sorryserver warn
73-l7vsd_module warn
74-l7vsd_replication warn
75-l7vsd_replication_sendthread warn
76-l7vsd_parameter warn
77-l7vsd_logger warn
78-l7vsd_command warn
79-l7vsd_start_stop warn
80-l7vsd_system warn
81-l7vsd_system_memory warn
82-l7vsd_system_endpoint warn
83-l7vsd_system_signal warn
84-l7vsd_system_environment warn
85-l7vsd_snmpbridge warn
86-l7vsd_protocol warn
87-l7vsd_schedule warn
88-
89-Replication Mode:
90-SINGLE
91-
92-SNMPAgent Connection Status:
93-non-connecting
94-
95-SNMPAgent Log Level:
96-Category Level
97-snmpagent_start_stop warn
98-snmpagent_manager_receive warn
99-snmpagent_manager_send warn
100-snmpagent_l7vsd_receive warn
101-snmpagent_l7vsd_send warn
102-snmpagent_logger warn
103-snmpagent_parameter warn
104-snmpagent_system warn
105-snmpagent_system_memory warn
106-snmpagent_system_endpoint warn
107-snmpagent_system_signal warn
108-snmpagent_system_environment warn
109-
110-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
111- SorryAddress:Port Sorry_cc Sorry_flag
112- QoS-up Throughput-up
113- QoS-down Throughput-down
114- SSL_config_file
115- Socket option
116- Access_log_flag
117- Access_log_file
118- Access_log_rotate option
119- -> RemoteAddress:Port Forward Weight ActiveConn InactConn
120-TCP localhost:40001 sessionless rr --sorry-uri '/'
121- none 0 0
122- 0 0
123- 0 0
124- none
125- none
126- 0
127- none
128- --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
129- -> localhost:50001 Masq 3 0 0
130- -> localhost:50002 Masq 0 0 0 "
131-if [ "${RET}" != "${EXPECT}" ]
132-then
133- echo "Test failed: $L7VSADM -V"
134- exit 1
135-fi
136-
137-exit 0
138-
--- a/test/script/l7vsadm/l7vsadm-3-2-3.sh
+++ /dev/null
@@ -1,101 +0,0 @@
1-#!/bin/bash
2-
3-. ${SET_DEFAULT_CONF}
4-
5-#Add Service
6-$L7VSD
7-if [ $? -ne 0 ]
8-then
9- echo "Test failed: $L7VSD"
10- exit 1
11-fi
12-usleep 100000
13-
14-$L7VSADM -A -t localhost4:40001 -m sessionless
15-if [ $? -ne 0 ]
16-then
17- echo "Test failed: $L7VSADM -A -t localhost4:40001 -m sessionless"
18- exit 1
19-fi
20-
21-
22-RET=`$L7VSADM -V -n`
23-EXPECT="Layer-7 Virtual Server version 3.0.0
24-L7vsd Log Level:
25-Category Level
26-l7vsd_network warn
27-l7vsd_network_qos warn
28-l7vsd_network_bandwidth warn
29-l7vsd_network_num_connection warn
30-l7vsd_network_access warn
31-l7vsd_mainthread warn
32-l7vsd_virtualservice warn
33-l7vsd_virtualservice_thread warn
34-l7vsd_session warn
35-l7vsd_session_thread warn
36-l7vsd_realserver warn
37-l7vsd_sorryserver warn
38-l7vsd_module warn
39-l7vsd_replication warn
40-l7vsd_replication_sendthread warn
41-l7vsd_parameter warn
42-l7vsd_logger warn
43-l7vsd_command warn
44-l7vsd_start_stop warn
45-l7vsd_system warn
46-l7vsd_system_memory warn
47-l7vsd_system_endpoint warn
48-l7vsd_system_signal warn
49-l7vsd_system_environment warn
50-l7vsd_snmpbridge warn
51-l7vsd_protocol warn
52-l7vsd_schedule warn
53-
54-Replication Mode:
55-SINGLE
56-
57-SNMPAgent Connection Status:
58-non-connecting
59-
60-SNMPAgent Log Level:
61-Category Level
62-snmpagent_start_stop warn
63-snmpagent_manager_receive warn
64-snmpagent_manager_send warn
65-snmpagent_l7vsd_receive warn
66-snmpagent_l7vsd_send warn
67-snmpagent_logger warn
68-snmpagent_parameter warn
69-snmpagent_system warn
70-snmpagent_system_memory warn
71-snmpagent_system_endpoint warn
72-snmpagent_system_signal warn
73-snmpagent_system_environment warn
74-
75-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
76- SorryAddress:Port Sorry_cc Sorry_flag
77- QoS-up Throughput-up
78- QoS-down Throughput-down
79- SSL_config_file
80- Socket option
81- Access_log_flag
82- Access_log_file
83- Access_log_rotate option
84- -> RemoteAddress:Port Forward Weight ActiveConn InactConn
85-TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/'
86- none 0 0
87- 0 0
88- 0 0
89- none
90- none
91- 0
92- none
93- --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
94-if [ "${RET}" != "${EXPECT}" ]
95-then
96- echo "Test failed: $L7VSADM -V -n"
97- exit 1
98-fi
99-
100-exit 0
101-
--- a/test/script/l7vsadm/l7vsadm-3-2-4.sh
+++ /dev/null
@@ -1,101 +0,0 @@
1-#!/bin/bash
2-
3-. ${SET_DEFAULT_CONF}
4-
5-#Add Service
6-$L7VSD
7-if [ $? -ne 0 ]
8-then
9- echo "Test failed: $L7VSD"
10- exit 1
11-fi
12-usleep 100000
13-
14-$L7VSADM -A -t localhost6:40001 -m sessionless
15-if [ $? -ne 0 ]
16-then
17- echo "Test failed: $L7VSADM -A -t localhost6:40001 -m sessionless"
18- exit 1
19-fi
20-
21-
22-RET=`$L7VSADM -V -n`
23-EXPECT="Layer-7 Virtual Server version 3.0.0
24-L7vsd Log Level:
25-Category Level
26-l7vsd_network warn
27-l7vsd_network_qos warn
28-l7vsd_network_bandwidth warn
29-l7vsd_network_num_connection warn
30-l7vsd_network_access warn
31-l7vsd_mainthread warn
32-l7vsd_virtualservice warn
33-l7vsd_virtualservice_thread warn
34-l7vsd_session warn
35-l7vsd_session_thread warn
36-l7vsd_realserver warn
37-l7vsd_sorryserver warn
38-l7vsd_module warn
39-l7vsd_replication warn
40-l7vsd_replication_sendthread warn
41-l7vsd_parameter warn
42-l7vsd_logger warn
43-l7vsd_command warn
44-l7vsd_start_stop warn
45-l7vsd_system warn
46-l7vsd_system_memory warn
47-l7vsd_system_endpoint warn
48-l7vsd_system_signal warn
49-l7vsd_system_environment warn
50-l7vsd_snmpbridge warn
51-l7vsd_protocol warn
52-l7vsd_schedule warn
53-
54-Replication Mode:
55-SINGLE
56-
57-SNMPAgent Connection Status:
58-non-connecting
59-
60-SNMPAgent Log Level:
61-Category Level
62-snmpagent_start_stop warn
63-snmpagent_manager_receive warn
64-snmpagent_manager_send warn
65-snmpagent_l7vsd_receive warn
66-snmpagent_l7vsd_send warn
67-snmpagent_logger warn
68-snmpagent_parameter warn
69-snmpagent_system warn
70-snmpagent_system_memory warn
71-snmpagent_system_endpoint warn
72-snmpagent_system_signal warn
73-snmpagent_system_environment warn
74-
75-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
76- SorryAddress:Port Sorry_cc Sorry_flag
77- QoS-up Throughput-up
78- QoS-down Throughput-down
79- SSL_config_file
80- Socket option
81- Access_log_flag
82- Access_log_file
83- Access_log_rotate option
84- -> RemoteAddress:Port Forward Weight ActiveConn InactConn
85-TCP [::1]:40001 sessionless rr --sorry-uri '/'
86- none 0 0
87- 0 0
88- 0 0
89- none
90- none
91- 0
92- none
93- --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
94-if [ "${RET}" != "${EXPECT}" ]
95-then
96- echo "Test failed: $L7VSADM -V -n"
97- exit 1
98-fi
99-
100-exit 0
101-
--- a/test/script/l7vsadm/l7vsadm-3-2-7.sh
+++ /dev/null
@@ -1,84 +0,0 @@
1-#!/bin/bash
2-
3-. ${SET_DEFAULT_CONF}
4-
5-#Add Service
6-$L7VSD
7-if [ $? -ne 0 ]
8-then
9- echo "Test failed: $L7VSD"
10- exit 1
11-fi
12-usleep 100000
13-
14-RET=`$L7VSADM -V`
15-EXPECT="Layer-7 Virtual Server version 3.0.0
16-L7vsd Log Level:
17-Category Level
18-l7vsd_network warn
19-l7vsd_network_qos warn
20-l7vsd_network_bandwidth warn
21-l7vsd_network_num_connection warn
22-l7vsd_network_access warn
23-l7vsd_mainthread warn
24-l7vsd_virtualservice warn
25-l7vsd_virtualservice_thread warn
26-l7vsd_session warn
27-l7vsd_session_thread warn
28-l7vsd_realserver warn
29-l7vsd_sorryserver warn
30-l7vsd_module warn
31-l7vsd_replication warn
32-l7vsd_replication_sendthread warn
33-l7vsd_parameter warn
34-l7vsd_logger warn
35-l7vsd_command warn
36-l7vsd_start_stop warn
37-l7vsd_system warn
38-l7vsd_system_memory warn
39-l7vsd_system_endpoint warn
40-l7vsd_system_signal warn
41-l7vsd_system_environment warn
42-l7vsd_snmpbridge warn
43-l7vsd_protocol warn
44-l7vsd_schedule warn
45-
46-Replication Mode:
47-SINGLE
48-
49-SNMPAgent Connection Status:
50-non-connecting
51-
52-SNMPAgent Log Level:
53-Category Level
54-snmpagent_start_stop warn
55-snmpagent_manager_receive warn
56-snmpagent_manager_send warn
57-snmpagent_l7vsd_receive warn
58-snmpagent_l7vsd_send warn
59-snmpagent_logger warn
60-snmpagent_parameter warn
61-snmpagent_system warn
62-snmpagent_system_memory warn
63-snmpagent_system_endpoint warn
64-snmpagent_system_signal warn
65-snmpagent_system_environment warn
66-
67-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
68- SorryAddress:Port Sorry_cc Sorry_flag
69- QoS-up Throughput-up
70- QoS-down Throughput-down
71- SSL_config_file
72- Socket option
73- Access_log_flag
74- Access_log_file
75- Access_log_rotate option
76- -> RemoteAddress:Port Forward Weight ActiveConn InactConn"
77-if [ "${RET}" != "${EXPECT}" ]
78-then
79- echo "Test failed: $L7VSADM -V"
80- exit 1
81-fi
82-
83-exit 0
84-
--- a/test/script/l7vsadm/l7vsadm-3-2-8.sh
+++ /dev/null
@@ -1,101 +0,0 @@
1-#!/bin/bash
2-
3-. ${SET_DEFAULT_CONF}
4-
5-#Add Service
6-$L7VSD
7-if [ $? -ne 0 ]
8-then
9- echo "Test failed: $L7VSD"
10- exit 1
11-fi
12-usleep 100000
13-
14-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless
15-if [ $? -ne 0 ]
16-then
17- echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless"
18- exit 1
19-fi
20-
21-
22-RET=`$L7VSADM -V -n`
23-EXPECT="Layer-7 Virtual Server version 3.0.0
24-L7vsd Log Level:
25-Category Level
26-l7vsd_network warn
27-l7vsd_network_qos warn
28-l7vsd_network_bandwidth warn
29-l7vsd_network_num_connection warn
30-l7vsd_network_access warn
31-l7vsd_mainthread warn
32-l7vsd_virtualservice warn
33-l7vsd_virtualservice_thread warn
34-l7vsd_session warn
35-l7vsd_session_thread warn
36-l7vsd_realserver warn
37-l7vsd_sorryserver warn
38-l7vsd_module warn
39-l7vsd_replication warn
40-l7vsd_replication_sendthread warn
41-l7vsd_parameter warn
42-l7vsd_logger warn
43-l7vsd_command warn
44-l7vsd_start_stop warn
45-l7vsd_system warn
46-l7vsd_system_memory warn
47-l7vsd_system_endpoint warn
48-l7vsd_system_signal warn
49-l7vsd_system_environment warn
50-l7vsd_snmpbridge warn
51-l7vsd_protocol warn
52-l7vsd_schedule warn
53-
54-Replication Mode:
55-SINGLE
56-
57-SNMPAgent Connection Status:
58-non-connecting
59-
60-SNMPAgent Log Level:
61-Category Level
62-snmpagent_start_stop warn
63-snmpagent_manager_receive warn
64-snmpagent_manager_send warn
65-snmpagent_l7vsd_receive warn
66-snmpagent_l7vsd_send warn
67-snmpagent_logger warn
68-snmpagent_parameter warn
69-snmpagent_system warn
70-snmpagent_system_memory warn
71-snmpagent_system_endpoint warn
72-snmpagent_system_signal warn
73-snmpagent_system_environment warn
74-
75-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
76- SorryAddress:Port Sorry_cc Sorry_flag
77- QoS-up Throughput-up
78- QoS-down Throughput-down
79- SSL_config_file
80- Socket option
81- Access_log_flag
82- Access_log_file
83- Access_log_rotate option
84- -> RemoteAddress:Port Forward Weight ActiveConn InactConn
85-TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/'
86- none 0 0
87- 0 0
88- 0 0
89- none
90- none
91- 0
92- none
93- --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
94-if [ "${RET}" != "${EXPECT}" ]
95-then
96- echo "Test failed: $L7VSADM -V -n"
97- exit 1
98-fi
99-
100-exit 0
101-
--- a/test/script/l7vsadm/l7vsadm-3-2-9.sh
+++ /dev/null
@@ -1,101 +0,0 @@
1-#!/bin/bash
2-
3-. ${SET_DEFAULT_CONF}
4-
5-#Add Service
6-$L7VSD
7-if [ $? -ne 0 ]
8-then
9- echo "Test failed: $L7VSD"
10- exit 1
11-fi
12-usleep 100000
13-
14-$L7VSADM -A -t [::1]:40001 -m sessionless
15-if [ $? -ne 0 ]
16-then
17- echo "Test failed: $L7VSADM -A -t [::1]:40001 -m sessionless"
18- exit 1
19-fi
20-
21-
22-RET=`$L7VSADM -V -n`
23-EXPECT="Layer-7 Virtual Server version 3.0.0
24-L7vsd Log Level:
25-Category Level
26-l7vsd_network warn
27-l7vsd_network_qos warn
28-l7vsd_network_bandwidth warn
29-l7vsd_network_num_connection warn
30-l7vsd_network_access warn
31-l7vsd_mainthread warn
32-l7vsd_virtualservice warn
33-l7vsd_virtualservice_thread warn
34-l7vsd_session warn
35-l7vsd_session_thread warn
36-l7vsd_realserver warn
37-l7vsd_sorryserver warn
38-l7vsd_module warn
39-l7vsd_replication warn
40-l7vsd_replication_sendthread warn
41-l7vsd_parameter warn
42-l7vsd_logger warn
43-l7vsd_command warn
44-l7vsd_start_stop warn
45-l7vsd_system warn
46-l7vsd_system_memory warn
47-l7vsd_system_endpoint warn
48-l7vsd_system_signal warn
49-l7vsd_system_environment warn
50-l7vsd_snmpbridge warn
51-l7vsd_protocol warn
52-l7vsd_schedule warn
53-
54-Replication Mode:
55-SINGLE
56-
57-SNMPAgent Connection Status:
58-non-connecting
59-
60-SNMPAgent Log Level:
61-Category Level
62-snmpagent_start_stop warn
63-snmpagent_manager_receive warn
64-snmpagent_manager_send warn
65-snmpagent_l7vsd_receive warn
66-snmpagent_l7vsd_send warn
67-snmpagent_logger warn
68-snmpagent_parameter warn
69-snmpagent_system warn
70-snmpagent_system_memory warn
71-snmpagent_system_endpoint warn
72-snmpagent_system_signal warn
73-snmpagent_system_environment warn
74-
75-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
76- SorryAddress:Port Sorry_cc Sorry_flag
77- QoS-up Throughput-up
78- QoS-down Throughput-down
79- SSL_config_file
80- Socket option
81- Access_log_flag
82- Access_log_file
83- Access_log_rotate option
84- -> RemoteAddress:Port Forward Weight ActiveConn InactConn
85-TCP [::1]:40001 sessionless rr --sorry-uri '/'
86- none 0 0
87- 0 0
88- 0 0
89- none
90- none
91- 0
92- none
93- --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
94-if [ "${RET}" != "${EXPECT}" ]
95-then
96- echo "Test failed: $L7VSADM -V -n"
97- exit 1
98-fi
99-
100-exit 0
101-
--- a/test/script/l7vsadm/l7vsadm-4-1-17.sh
+++ b/test/script/l7vsadm/l7vsadm-4-1-17.sh
@@ -132,50 +132,50 @@ l7vsd_system_memory warn
132132 l7vsd_system_endpoint warn
133133 l7vsd_system_signal warn
134134 l7vsd_system_environment warn
135-l7vsd_snmpbridge warn
135+l7vsd_snmpagent info
136136 l7vsd_protocol warn
137137 l7vsd_schedule warn
138138
139139 Replication Mode:
140140 SINGLE
141141
142-SNMPAgent Connection Status:
143-non-connecting
144-
145-SNMPAgent Log Level:
146-Category Level
147-snmpagent_start_stop warn
148-snmpagent_manager_receive warn
149-snmpagent_manager_send warn
150-snmpagent_l7vsd_receive warn
151-snmpagent_l7vsd_send warn
152-snmpagent_logger warn
153-snmpagent_parameter warn
154-snmpagent_system warn
155-snmpagent_system_memory warn
156-snmpagent_system_endpoint warn
157-snmpagent_system_signal warn
158-snmpagent_system_environment warn
142+SNMPAgent:
143+Agent Status inactive
144+log trap status none
145+log trap level none
146+cache update interval none
147+start date none
148+last request date none
149+last trap date none
150+total GET requests none
151+total SET requests none
152+total trap counts none
159153
160154 Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
161- SorryAddress:Port Sorry_cc Sorry_flag
162- QoS-up Throughput-up
163- QoS-down Throughput-down
164- SSL_config_file
165- Socket option
166- Access_log_flag
167- Access_log_file
168- Access_log_rotate option
169155 -> RemoteAddress:Port Forward Weight ActiveConn InactConn
170-TCP localhost:40001 ip rr --timeout 3600 --no-reschedule --sorry-uri '/'
171- none 0 0
172- 0 0
173- 0 0
174- none
175- none
176- 0
177- none
178- --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
156+TCP localhost:40001 ip rr --timeout 3600 --no-reschedule --sorry-uri '/' --statistic 0
157+ Bypass Settings:
158+ Sorry Server none
159+ Max Connection 0
160+ Sorry Flag off
161+ SSL Settings:
162+ SSL Config File none
163+ Logging Settings:
164+ Access Log off
165+ Access Log File none
166+ Access Log Rotate --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
167+ Socket Settings:
168+ TCP_DEFER_ACCEPT disable
169+ TCP_NODELAY disable
170+ TCP_CORK disable
171+ TCP_QUICKACK disable
172+ Throughput:
173+ Current Upload / Limit 0.000000 Mbps / 0.000000 Mbps
174+ Current Download / Limit 0.000000 Mbps / 0.000000 Mbps
175+ Statistics:
176+ HTTP Total Requests 0
177+ HTTP GET Requests 0
178+ HTTP POST Requests 0"
179179
180180 if [ "${RET}" != "${EXPECT}" ]
181181 then
--- a/test/script/l7vsadm/l7vsadm-4-1-2.sh
+++ b/test/script/l7vsadm/l7vsadm-4-1-2.sh
@@ -64,59 +64,74 @@ l7vsd_system_memory warn
6464 l7vsd_system_endpoint warn
6565 l7vsd_system_signal warn
6666 l7vsd_system_environment warn
67-l7vsd_snmpbridge warn
67+l7vsd_snmpagent info
6868 l7vsd_protocol warn
6969 l7vsd_schedule warn
7070
7171 Replication Mode:
7272 SINGLE
7373
74-SNMPAgent Connection Status:
75-non-connecting
76-
77-SNMPAgent Log Level:
78-Category Level
79-snmpagent_start_stop warn
80-snmpagent_manager_receive warn
81-snmpagent_manager_send warn
82-snmpagent_l7vsd_receive warn
83-snmpagent_l7vsd_send warn
84-snmpagent_logger warn
85-snmpagent_parameter warn
86-snmpagent_system warn
87-snmpagent_system_memory warn
88-snmpagent_system_endpoint warn
89-snmpagent_system_signal warn
90-snmpagent_system_environment warn
74+SNMPAgent:
75+Agent Status inactive
76+log trap status none
77+log trap level none
78+cache update interval none
79+start date none
80+last request date none
81+last trap date none
82+total GET requests none
83+total SET requests none
84+total trap counts none
9185
9286 Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
93- SorryAddress:Port Sorry_cc Sorry_flag
94- QoS-up Throughput-up
95- QoS-down Throughput-down
96- SSL_config_file
97- Socket option
98- Access_log_flag
99- Access_log_file
100- Access_log_rotate option
10187 -> RemoteAddress:Port Forward Weight ActiveConn InactConn
102-TCP localhost:40001 sessionless rr --sorry-uri '/'
103- localhost:50001(Tproxy) 1000 1
104- 512 0
105- 512 0
106- /etc/l7vs/sslproxy/sslproxy.target.cf
107- deferaccept
108- 1
109- /var/log/l7vs/access_log
110- --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
111-TCP localhost:40002 sessionless rr --sorry-uri '/'
112- localhost:50001(Masq) 1000 1
113- 512 0
114- 512 0
115- /etc/l7vs/sslproxy/sslproxy.target.cf
116- deferaccept
117- 1
118- /var/log/l7vs/access_log
119- --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
88+TCP localhost:40001 sessionless rr --sorry-uri '/' --statistic 0
89+ Bypass Settings:
90+ Sorry Server localhost:50001 Tproxy
91+ Max Connection 1000
92+ Sorry Flag on
93+ SSL Settings:
94+ SSL Config File /etc/l7vs/sslproxy/sslproxy.target.cf
95+ Logging Settings:
96+ Access Log on
97+ Access Log File deferaccept
98+ Access Log Rotate --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
99+ Socket Settings:
100+ TCP_DEFER_ACCEPT enable
101+ TCP_NODELAY disable
102+ TCP_CORK disable
103+ TCP_QUICKACK disable
104+ Throughput:
105+ Current Upload / Limit 0.000000 Mbps / 0.004096 Mbps
106+ Current Download / Limit 0.000000 Mbps / 0.004096 Mbps
107+ Statistics:
108+ HTTP Total Requests 0
109+ HTTP GET Requests 0
110+ HTTP POST Requests 0
111+TCP localhost:40002 sessionless rr --sorry-uri '/' --statistic 0
112+ Bypass Settings:
113+ Sorry Server localhost:50001 Masq
114+ Max Connection 1000
115+ Sorry Flag on
116+ SSL Settings:
117+ SSL Config File /etc/l7vs/sslproxy/sslproxy.target.cf
118+ Logging Settings:
119+ Access Log on
120+ Access Log File deferaccept
121+ Access Log Rotate --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
122+ Socket Settings:
123+ TCP_DEFER_ACCEPT enable
124+ TCP_NODELAY disable
125+ TCP_CORK disable
126+ TCP_QUICKACK disable
127+ Throughput:
128+ Current Upload / Limit 0.000000 Mbps / 0.004096 Mbps
129+ Current Download / Limit 0.000000 Mbps / 0.004096 Mbps
130+ Statistics:
131+ HTTP Total Requests 0
132+ HTTP GET Requests 0
133+ HTTP POST Requests 0"
134+
120135 if [ "${RET}" != "${EXPECT}" ]
121136 then
122137 echo "Test failed: $L7VSADM -V -n"
--- a/test/script/l7vsadm/l7vsadm-4-1-36-1.sh
+++ b/test/script/l7vsadm/l7vsadm-4-1-36-1.sh
@@ -91,6 +91,8 @@ TCP 127.0.0.1:40001 ip rr --timeout 3600 --no-reschedule --sorry-uri '/' --stati
9191 HTTP Total Requests 0
9292 HTTP GET Requests 0
9393 HTTP POST Requests 0"
94+echo "${RET}" > /tmp/a.txt
95+echo "${EXPECT}" > /tmp/b.txt
9496 if [ "${RET}" != "${EXPECT}" ]
9597 then
9698 echo "Test failed: $L7VSADM -V -n"
--- a/test/script/session/session-43.sh
+++ b/test/script/session/session-43.sh
@@ -112,6 +112,7 @@ TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
112112 HTTP Total Requests 0
113113 HTTP GET Requests 0
114114 HTTP POST Requests 0"
115+echo "$RET"
115116 if [ "${RET}" != "${EXPECT}" ]
116117 then
117118 echo "Test failed: l7vsadm -V -n"
--- /dev/null
+++ b/test/script/svn-commit.tmp
@@ -0,0 +1,38 @@
1+
2+-- この行以下は無視されます --
3+
4+M l7directord/l7directord-4-1-5-2.sh
5+D l7directord/l7directord-5-2-4-4.sh
6+M l7directord/l7directord-1-2-48-2.sh
7+M l7directord/l7directord-4-1-2.sh
8+AM l7directord/l7directord-5-3-2.sh
9+D l7directord/l7directord-5-2-5-3.sh
10+M l7directord/l7directord-5-2-9.sh
11+M l7directord/l7directord-1-2-49-1.sh
12+D l7directord/l7directord-5-2-4-5.sh
13+M l7directord/l7directord-5-2-26.sh
14+M l7directord/l7directord-5-2-24-6.sh
15+AM l7directord/l7directord-5-3-3.sh
16+D l7directord/l7directord-5-2-5-4.sh
17+M l7directord/l7directord-1-2-49-2.sh
18+D l7directord/l7directord-5-2-4-6.sh
19+M l7directord/l7directord-4-1-1-1.sh
20+AM l7directord/l7directord-5-3-4.sh
21+M l7directord/l7directord-1-2-49-3.sh
22+RM l7directord/l7directord-1-2-44-1.sh
23+M l7directord/l7directord-4-1-1-2.sh
24+M l7directord/l7directord-1-3-9.sh
25+M l7directord/l7directord-5-2-24-3.sh
26+D l7directord/l7directord-1-2-49-4.sh
27+M l7directord/l7directord-4-1-5-1.sh
28+M l7directord/l7directord-1-2-44-2.sh
29+M l7directord/materials/l7directord-help.txt
30+A l7directord/materials/l7directord-5-3-3-l7directord.cf
31+AM l7directord/materials/l7directord-5-2-24-callback.sh
32+M l7directord/materials/l7directord-1-2-44-l7directord.cf
33+A l7directord/materials/l7directord-5-3-2-l7directord.cf
34+A l7directord/materials/l7directord-5-2-24-no_exec_callback.sh
35+M l7directord/materials/l7directord-1-2-48-l7directord.cf
36+A l7directord/materials/l7directord-1-3-11-l7directord.cf
37+M l7directord/materials/l7directord-1-2-46-l7directord.cf
38+A l7directord/materials/l7directord-5-3-4-l7directord.cf