forked from apache/apisix
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'apisix/master' into env
* apisix/master: change: limit the maximum length of Lua code to 100. (apache#1525) doc: fixed wrong configurations in the logger docs (apache#1530) feature: add batch request plugin. (apache#1388) plugin(kafka-logger): Updating kafka logger to use the batch processor util (apache#1358) test: reindex by tools `reindex`. (apache#1519) fix: skip tombstone mark when iterating the global values (apache#1517) bugfix: init `clean_handlers` when add new item from etcd. (apache#1412) doc: fix the doc style for serverless*.md (apache#1511) test: check lua code style in all Lua file under apisix/ (apache#1518) feat: support saving k8s deployment info to upstream (apache#1502) doc: update steps of build dashboard. (apache#1506) rocks: used tag instead of branch. (apache#1503) test: fix regex usage in some cases (apache#1504) doc: add short introduction about how to change log level (apache#1484) bugfix(lrucache): when creating cached objects, use resty-lock to avoid repeated creation. (apache#1486) bug: fixed wrong string join in limit-count plugin. (apache#1487) doc(readme.md): upload Node.js version for building dashboard. (apache#1485) release: released 1.2 version. (apache#1436) # Conflicts: # bin/apisix # t/node/upstream.t
- Loading branch information
Showing
53 changed files
with
1,938 additions
and
237 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| std = "ngx_lua" | ||
| unused_args = false | ||
| redefined = false | ||
| max_line_length = 100 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| -- | ||
| -- Licensed to the Apache Software Foundation (ASF) under one or more | ||
| -- contributor license agreements. See the NOTICE file distributed with | ||
| -- this work for additional information regarding copyright ownership. | ||
| -- The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| -- (the "License"); you may not use this file except in compliance with | ||
| -- the License. You may obtain a copy of the License at | ||
| -- | ||
| -- http://www.apache.org/licenses/LICENSE-2.0 | ||
| -- | ||
| -- Unless required by applicable law or agreed to in writing, software | ||
| -- distributed under the License is distributed on an "AS IS" BASIS, | ||
| -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| -- See the License for the specific language governing permissions and | ||
| -- limitations under the License. | ||
| -- | ||
| local setmetatable = setmetatable | ||
| local type = type | ||
|
|
||
|
|
||
| local _M = {} | ||
|
|
||
|
|
||
| local function _iterate_values(self, tab) | ||
| while true do | ||
| self.idx = self.idx + 1 | ||
| local v = tab[self.idx] | ||
| if type(v) == "table" then | ||
| return self.idx, v | ||
| end | ||
| if v == nil then | ||
| return nil, nil | ||
| end | ||
| -- skip the tombstone | ||
| end | ||
| end | ||
|
|
||
|
|
||
| function _M.iterate_values(tab) | ||
| local iter = setmetatable({idx = 0}, {__call = _iterate_values}) | ||
| return iter, tab, 0 | ||
| end | ||
|
|
||
|
|
||
| return _M |
Oops, something went wrong.