Skip to content

Commit

Permalink
chore: remove the folder 'logs' in root and replace baidu.com with gi…
Browse files Browse the repository at this point in the history
…thub.com in test cases (apache#2374)

* rm log

* replace baidu.com to github.com in testcases

* keep folder logs

* remove the folder logs

* update Makefile
  • Loading branch information
dabue authored Oct 12, 2020
1 parent b8e4b85 commit 40577ee
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions bin/apisix
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,9 @@ local openresty_args = [[openresty -p ]] .. apisix_home .. [[ -c ]]
.. apisix_home .. [[/conf/nginx.conf]]

function _M.start(...)

local cmd_logs = "mkdir -p " .. apisix_home .. "/logs"
os.execute(cmd_logs)
-- check running
local pid_path = apisix_home .. "/logs/nginx.pid"
local pid, err = read_file(pid_path)
Expand Down
Empty file removed logs/placeholder.txt
Empty file.
4 changes: 2 additions & 2 deletions t/node/route-domain-with-local-dns.t
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ __DATA__
"upstream": {
"nodes": {
"127.0.0.1:1980": 1,
"baidu.com:80": 0
"github.com:80": 0
},
"type": "roundrobin"
},
Expand Down Expand Up @@ -89,4 +89,4 @@ hello world
--- no_error_log
[error]
--- error_log eval
qr/dns resolver domain: baidu.com to \d+.\d+.\d+.\d+/
qr/dns resolver domain: github.com to \d+.\d+.\d+.\d+/
4 changes: 2 additions & 2 deletions t/node/route-domain.t
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ __DATA__
"upstream": {
"nodes": {
"127.0.0.1:1980": 1,
"baidu.com:80": 0
"github.com:80": 0
},
"type": "roundrobin"
},
Expand Down Expand Up @@ -79,7 +79,7 @@ hello world
--- no_error_log
[error]
--- error_log eval
qr/dns resolver domain: baidu.com to \d+.\d+.\d+.\d+/
qr/dns resolver domain: github.com to \d+.\d+.\d+.\d+/
Expand Down

0 comments on commit 40577ee

Please sign in to comment.