This is an automated email from the ASF dual-hosted git repository.
tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 5731f97 chore: replace duplicate content with already declared
variables (#4655)
5731f97 is described below
commit 5731f97dbf28a7d79e3d670888dcaddbef3fe148
Author: okaybase <[email protected]>
AuthorDate: Fri Jul 23 16:48:28 2021 +0800
chore: replace duplicate content with already declared variables (#4655)
Co-authored-by: lixingwang <[email protected]>
---
apisix/admin/proto.lua | 5 +----
apisix/admin/routes.lua | 3 +--
apisix/admin/ssl.lua | 3 +--
apisix/admin/stream_routes.lua | 4 +---
apisix/admin/upstreams.lua | 2 +-
5 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/apisix/admin/proto.lua b/apisix/admin/proto.lua
index 687bc4f..6ab8892 100644
--- a/apisix/admin/proto.lua
+++ b/apisix/admin/proto.lua
@@ -104,11 +104,8 @@ function _M.post(id, conf)
end
local key = "/proto"
-
utils.inject_timestamp(conf)
-
- -- core.log.info("key: ", key)
- local res, err = core.etcd.push("/proto", conf)
+ local res, err = core.etcd.push(key, conf)
if not res then
core.log.error("failed to post proto[", key, "]: ", err)
return 500, {error_msg = err}
diff --git a/apisix/admin/routes.lua b/apisix/admin/routes.lua
index 8de5cbf..605d7e6 100644
--- a/apisix/admin/routes.lua
+++ b/apisix/admin/routes.lua
@@ -214,9 +214,8 @@ function _M.post(id, conf, sub_path, args)
end
local key = "/routes"
- -- core.log.info("key: ", key)
utils.inject_timestamp(conf)
- local res, err = core.etcd.push("/routes", conf, args.ttl)
+ local res, err = core.etcd.push(key, conf, args.ttl)
if not res then
core.log.error("failed to post route[", key, "] to etcd: ", err)
return 500, {error_msg = err}
diff --git a/apisix/admin/ssl.lua b/apisix/admin/ssl.lua
index b1c78c8..568dc0d 100644
--- a/apisix/admin/ssl.lua
+++ b/apisix/admin/ssl.lua
@@ -127,9 +127,8 @@ function _M.post(id, conf)
end
local key = "/ssl"
- -- core.log.info("key: ", key)
utils.inject_timestamp(conf)
- local res, err = core.etcd.push("/ssl", conf)
+ local res, err = core.etcd.push(key, conf)
if not res then
core.log.error("failed to post ssl[", key, "]: ", err)
return 500, {error_msg = err}
diff --git a/apisix/admin/stream_routes.lua b/apisix/admin/stream_routes.lua
index d8a5d42..9f8819f 100644
--- a/apisix/admin/stream_routes.lua
+++ b/apisix/admin/stream_routes.lua
@@ -127,10 +127,8 @@ function _M.post(id, conf)
end
local key = "/stream_routes"
-
utils.inject_timestamp(conf)
-
- local res, err = core.etcd.push("/stream_routes", conf)
+ local res, err = core.etcd.push(key, conf)
if not res then
core.log.error("failed to post stream route[", key, "]: ", err)
return 500, {error_msg = err}
diff --git a/apisix/admin/upstreams.lua b/apisix/admin/upstreams.lua
index 9344f36..d5ee5c8 100644
--- a/apisix/admin/upstreams.lua
+++ b/apisix/admin/upstreams.lua
@@ -51,7 +51,7 @@ local function check_conf(id, conf, need_id)
conf.id = id
core.log.info("schema: ", core.json.delay_encode(core.schema.upstream))
- core.log.info("conf : ", core.json.delay_encode(conf))
+ core.log.info("conf: ", core.json.delay_encode(conf))
local ok, err = apisix_upstream.check_upstream_conf(conf)
if not ok then
