This is an automated email from the ASF dual-hosted git repository. wenming 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 dcdbc1c chore: spelling (#3027) dcdbc1c is described below commit dcdbc1cc9eadff8311148e9f1d8f5f89c3bb2c9c Author: John Bampton <jbamp...@users.noreply.github.com> AuthorDate: Sun Dec 13 21:31:24 2020 +1000 chore: spelling (#3027) --- apisix/core/config_etcd.lua | 6 +++--- apisix/core/config_yaml.lua | 2 +- apisix/plugins/zipkin.lua | 2 +- apisix/plugins/zipkin/reporter.lua | 2 +- t/node/invalid-route.t | 6 +++--- t/node/invalid-service.t | 4 ++-- t/node/invalid-upstream.t | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apisix/core/config_etcd.lua b/apisix/core/config_etcd.lua index 1434157..57d46ff 100644 --- a/apisix/core/config_etcd.lua +++ b/apisix/core/config_etcd.lua @@ -254,7 +254,7 @@ local function sync_data(self) data_valid = false log.error("invalid item data of [", self.key .. "/" .. key, "], val: ", item.value, - ", it shoud be a object") + ", it should be an object") end if data_valid and self.item_schema then @@ -355,7 +355,7 @@ local function sync_data(self) self:upgrade_version(res.modifiedIndex) return false, "invalid item data of [" .. self.key .. "/" .. key .. "], val: " .. res.value - .. ", it shoud be a object" + .. ", it should be an object" end if res.value and self.item_schema then @@ -650,7 +650,7 @@ end function _M.server_version(self) if not self.running then - return nil, "stoped" + return nil, "stopped" end return read_etcd_version(self.etcd_cli) diff --git a/apisix/core/config_yaml.lua b/apisix/core/config_yaml.lua index e10aa06..808daf6 100644 --- a/apisix/core/config_yaml.lua +++ b/apisix/core/config_yaml.lua @@ -189,7 +189,7 @@ local function sync_data(self) data_valid = false log.error("invalid item data of [", self.key .. "/" .. id, "], val: ", json.delay_encode(item), - ", it should be a object") + ", it should be an object") end local key = item.id or "arr_" .. i diff --git a/apisix/plugins/zipkin.lua b/apisix/plugins/zipkin.lua index fc75f8d..0255193 100644 --- a/apisix/plugins/zipkin.lua +++ b/apisix/plugins/zipkin.lua @@ -42,7 +42,7 @@ local schema = { }, server_addr = { type = "string", - description = "default is $server_addr, you can speific your external ip address", + description = "default is $server_addr, you can specify your external ip address", pattern = "^[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$" }, }, diff --git a/apisix/plugins/zipkin/reporter.lua b/apisix/plugins/zipkin/reporter.lua index 40d3b6c..202c626 100644 --- a/apisix/plugins/zipkin/reporter.lua +++ b/apisix/plugins/zipkin/reporter.lua @@ -168,7 +168,7 @@ function _M.init_processor(self) local processor, err = batch_processor:new(flush, process_conf) if err then - return false, "creat processor error: " .. err + return false, "create processor error: " .. err end self.processor = processor diff --git a/t/node/invalid-route.t b/t/node/invalid-route.t index 5788bf9..81fa6b2 100644 --- a/t/node/invalid-route.t +++ b/t/node/invalid-route.t @@ -47,7 +47,7 @@ GET /t --- grep_error_log eval qr/\[error\].*/ --- grep_error_log_out eval -qr{invalid item data of \[/apisix/routes/1\], val: mexxxxxxxxxxxxxxx, it shoud be a object} +qr{invalid item data of \[/apisix/routes/1\], val: mexxxxxxxxxxxxxxx, it should be an object} --- response_body_like eval qr/"value":"mexxxxxxxxxxxxxxx"/ @@ -63,7 +63,7 @@ GET /not_found --- grep_error_log eval qr/\[error\].*/ --- grep_error_log_out eval -qr{invalid item data of \[/apisix/routes/1\], val: mexxxxxxxxxxxxxxx, it shoud be a object} +qr{invalid item data of \[/apisix/routes/1\], val: mexxxxxxxxxxxxxxx, it should be an object} @@ -100,7 +100,7 @@ passed --- grep_error_log eval qr/\[error\].*/ --- grep_error_log_out eval -qr{invalid item data of \[/apisix/routes/1\], val: mexxxxxxxxxxxxxxx, it shoud be a object} +qr{invalid item data of \[/apisix/routes/1\], val: mexxxxxxxxxxxxxxx, it should be an object} diff --git a/t/node/invalid-service.t b/t/node/invalid-service.t index 883ead1..05196d8 100644 --- a/t/node/invalid-service.t +++ b/t/node/invalid-service.t @@ -48,7 +48,7 @@ GET /t --- grep_error_log eval qr/\[error\].*/ --- grep_error_log_out eval -qr{invalid item data of \[/apisix/services/1\], val: mexxxxxxxxxxxxxxx, it shoud be a object} +qr{invalid item data of \[/apisix/services/1\], val: mexxxxxxxxxxxxxxx, it should be an object} --- response_body_like eval qr/"value":"mexxxxxxxxxxxxxxx"/ @@ -64,7 +64,7 @@ GET /not_found --- grep_error_log eval qr/\[error\].*/ --- grep_error_log_out eval -qr{invalid item data of \[/apisix/services/1\], val: mexxxxxxxxxxxxxxx, it shoud be a object} +qr{invalid item data of \[/apisix/services/1\], val: mexxxxxxxxxxxxxxx, it should be an object} diff --git a/t/node/invalid-upstream.t b/t/node/invalid-upstream.t index b42b1b1..a35d4cc 100644 --- a/t/node/invalid-upstream.t +++ b/t/node/invalid-upstream.t @@ -47,7 +47,7 @@ GET /t --- grep_error_log eval qr/\[error\].*/ --- grep_error_log_out eval -qr{invalid item data of \[/apisix/upstreams/1\], val: mexxxxxxxxxxxxxxx, it shoud be a object} +qr{invalid item data of \[/apisix/upstreams/1\], val: mexxxxxxxxxxxxxxx, it should be an object} --- response_body_like eval qr/"value":"mexxxxxxxxxxxxxxx"/ @@ -63,7 +63,7 @@ GET /not_found --- grep_error_log eval qr/\[error\].*/ --- grep_error_log_out eval -qr{invalid item data of \[/apisix/upstreams/1\], val: mexxxxxxxxxxxxxxx, it shoud be a object} +qr{invalid item data of \[/apisix/upstreams/1\], val: mexxxxxxxxxxxxxxx, it should be an object}