test/apisix
1
0
Fork 0
mirror of https://gitee.com/iresty/apisix.git synced 2024-11-30 11:07:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

optimize: avoid concat string object, and kept source route id and se… (#738)

Browse Source 
* optimize: avoid concat string object, and kept source route id and service id.

* default config: changed the timeout of etcd to 3 sec.
This commit is contained in:
YuanSheng Wang 2019-10-28 15:57:30 +08:00 committed by WenMing
parent 44b2b29685
commit 4efc1202dc
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/config.yaml
View File

@ -53,7 +53,7 @@ nginx_config: # config for render the template to genarate n
etcd:
host: "http://127.0.0.1:2379" # etcd address
prefix: "/apisix" # apisix configurations prefix
timeout: 1 # 1 seconds
timeout: 3 # 3 seconds
plugins: # plugin list
- example-plugin

38
lua/apisix/plugin.lua
View File

@ -281,53 +281,43 @@ end
local function merge_service_route(service_conf, route_conf)
local new_service_conf
local new_conf = core.table.deepcopy(service_conf)
new_conf.value.service_id = new_conf.value.id
new_conf.value.id = route_conf.value.id
if route_conf.value.plugins then
for name, conf in pairs(route_conf.value.plugins) do
if not new_service_conf then
new_service_conf = core.table.deepcopy(service_conf)
end
new_service_conf.value.plugins[name] = conf
new_conf.value.plugins[name] = conf
end
end
local route_upstream = route_conf.value.upstream
if route_upstream then
if not new_service_conf then
new_service_conf = core.table.deepcopy(service_conf)
end
new_service_conf.value.upstream = route_upstream
new_conf.value.upstream = route_upstream
if route_upstream.checks then
route_upstream.parent = route_conf
end
new_service_conf.value.upstream_id = nil
return new_service_conf
new_conf.value.upstream_id = nil
end
if route_conf.value.upstream_id then
if not new_service_conf then
new_service_conf = core.table.deepcopy(service_conf)
end
new_service_conf.value.upstream_id = route_conf.value.upstream_id
new_conf.value.upstream_id = route_conf.value.upstream_id
end
-- core.log.info("merged conf : ", core.json.delay_encode(new_service_conf))
return new_service_conf or service_conf
-- core.log.info("merged conf : ", core.json.delay_encode(new_conf))
return new_conf
end
function _M.merge_service_route(service_conf, route_conf)
core.log.info("service conf: ", core.json.delay_encode(service_conf))
core.log.info("route conf: ", core.json.delay_encode(route_conf))
core.log.info(" route conf: ", core.json.delay_encode(route_conf))
local flag = tostring(service_conf) .. tostring(route_conf)
local new_service_conf = merged_route(flag, nil, merge_service_route,
service_conf, route_conf)
return new_service_conf, new_service_conf ~= service_conf
return merged_route(route_conf, service_conf,
merge_service_route,
service_conf, route_conf)
end
@ -354,7 +344,7 @@ function _M.merge_consumer_route(route_conf, consumer_conf)
local flag = tostring(route_conf) .. tostring(consumer_conf)
local new_conf = merged_route(flag, nil,
merge_consumer_route, route_conf, consumer_conf)
merge_consumer_route, route_conf, consumer_conf)
return new_conf, new_conf ~= route_conf
end