Skip to content

Commit a63b79d

Browse files
committed
revert: restore t/APISIX.pm to match master
1 parent 8fcdf7d commit a63b79d

1 file changed

Lines changed: 16 additions & 29 deletions

File tree

t/APISIX.pm

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ if ($custom_dns_server) {
7878
}
7979

8080

81-
my $events_module = $ENV{TEST_EVENTS_MODULE} // "lua-resty-worker-events";
81+
my $events_module = $ENV{TEST_EVENTS_MODULE} // "lua-resty-events";
8282
my $test_default_config = <<_EOC_;
8383
-- read the default configuration, modify it, and the Lua package
8484
-- cache will persist it for loading by other entrypoints
@@ -286,18 +286,19 @@ env OPENSSL_BIN;
286286
_EOC_
287287

288288

289-
# if ($version =~ m/\/apisix-nginx-module/) {
290-
# $main_config .= <<_EOC_;
291-
# thread_pool grpc-client-nginx-module threads=1;
292-
#
293-
# lua_shared_dict prometheus-metrics 15m;
294-
# lua_shared_dict prometheus-cache 10m;
295-
# lua_shared_dict standalone-config 10m;
296-
# lua_shared_dict status-report 1m;
297-
# lua_shared_dict nacos 10m;
298-
#
299-
#_EOC_
300-
# }
289+
if ($version =~ m/\/apisix-nginx-module/) {
290+
$main_config .= <<_EOC_;
291+
thread_pool grpc-client-nginx-module threads=1;
292+
293+
lua {
294+
lua_shared_dict prometheus-metrics 15m;
295+
lua_shared_dict prometheus-cache 10m;
296+
lua_shared_dict standalone-config 10m;
297+
lua_shared_dict status-report 1m;
298+
lua_shared_dict nacos 10m;
299+
}
300+
_EOC_
301+
}
301302

302303
# set default `timeout` to 5sec
303304
my $timeout = $block->timeout // 5;
@@ -586,12 +587,6 @@ _EOC_
586587
$http_config .= <<_EOC_;
587588
$lua_deps_path
588589
589-
lua_shared_dict prometheus-metrics 15m;
590-
lua_shared_dict prometheus-cache 10m;
591-
lua_shared_dict standalone-config 10m;
592-
lua_shared_dict status-report 1m;
593-
lua_shared_dict nacos 10m;
594-
595590
lua_shared_dict plugin-limit-req 10m;
596591
lua_shared_dict plugin-limit-count 10m;
597592
lua_shared_dict plugin-limit-count-reset-header 10m;
@@ -660,7 +655,7 @@ _EOC_
660655
keepalive 32;
661656
}
662657
663-
# lua_shared_dict prometheus-metrics 10m;
658+
lua_shared_dict prometheus-metrics 10m;
664659
_EOC_
665660
}
666661

@@ -788,18 +783,10 @@ _EOC_
788783
$config .= <<_EOC_;
789784
$ipv6_listen_conf
790785
791-
_EOC_
792-
793-
if ($version =~ m/--with-http_v3_module/) {
794-
$config .= <<_EOC_;
795786
listen 1994 quic reuseport;
796-
http3 on;
797-
_EOC_
798-
}
799-
800-
$config .= <<_EOC_;
801787
listen 1994 ssl;
802788
http2 on;
789+
http3 on;
803790
ssl_certificate cert/apisix.crt;
804791
ssl_certificate_key cert/apisix.key;
805792
lua_ssl_trusted_certificate $custom_trusted_cert;

0 commit comments

Comments
 (0)