[GitHub] [incubator-apisix-website] moonming merged pull request #24: fixed typo of name.
moonming merged pull request #24: fixed typo of name. URL: https://github.com/apache/incubator-apisix-website/pull/24 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-apisix-website] branch typo created (now 246a9ec)
This is an automated email from the ASF dual-hosted git repository. wenming pushed a change to branch typo in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git. at 246a9ec fixed typo of name. This branch includes the following new commits: new 246a9ec fixed typo of name. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[incubator-apisix-website] 01/01: fixed typo of name.
This is an automated email from the ASF dual-hosted git repository. wenming pushed a commit to branch typo in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git commit 246a9ec96ed00ad4befe1cdf3d7ed52d985f6475 Author: WenMing AuthorDate: Sun Mar 29 19:16:35 2020 +0800 fixed typo of name. --- content/team/index.en.md | 6 +++--- content/team/index.zh.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/team/index.en.md b/content/team/index.en.md index ba3b2cc..a60df52 100644 --- a/content/team/index.en.md +++ b/content/team/index.en.md @@ -73,10 +73,10 @@ include_footer: true - https://whimsy.apache.org/roster/committer/moonming; target="_blank">wenming + https://whimsy.apache.org/roster/committer/wenming; target="_blank">wenming -Ming Wen -Name +moonming +Ming Wen diff --git a/content/team/index.zh.md b/content/team/index.zh.md index 4327eda..81b0feb 100644 --- a/content/team/index.zh.md +++ b/content/team/index.zh.md @@ -73,10 +73,10 @@ include_footer: true - https://whimsy.apache.org/roster/committer/moonming; target="_blank">wenming + https://whimsy.apache.org/roster/committer/wenming; target="_blank">wenming -Ming Wen -Name +moonming +Ming Wen
[GitHub] [incubator-apisix-website] moonming opened a new pull request #24: fixed typo of name.
moonming opened a new pull request #24: fixed typo of name. URL: https://github.com/apache/incubator-apisix-website/pull/24 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-apisix-website] branch master updated: fixed typo of name. (#24)
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/incubator-apisix-website.git The following commit(s) were added to refs/heads/master by this push: new 582c365 fixed typo of name. (#24) 582c365 is described below commit 582c36571998a9707ef2a836ff220cc019198305 Author: Wen Ming AuthorDate: Sun Mar 29 19:18:19 2020 +0800 fixed typo of name. (#24) --- content/team/index.en.md | 6 +++--- content/team/index.zh.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/team/index.en.md b/content/team/index.en.md index ba3b2cc..a60df52 100644 --- a/content/team/index.en.md +++ b/content/team/index.en.md @@ -73,10 +73,10 @@ include_footer: true - https://whimsy.apache.org/roster/committer/moonming; target="_blank">wenming + https://whimsy.apache.org/roster/committer/wenming; target="_blank">wenming -Ming Wen -Name +moonming +Ming Wen diff --git a/content/team/index.zh.md b/content/team/index.zh.md index 4327eda..81b0feb 100644 --- a/content/team/index.zh.md +++ b/content/team/index.zh.md @@ -73,10 +73,10 @@ include_footer: true - https://whimsy.apache.org/roster/committer/moonming; target="_blank">wenming + https://whimsy.apache.org/roster/committer/wenming; target="_blank">wenming -Ming Wen -Name +moonming +Ming Wen
[incubator-apisix-website] branch master updated: Feat team (#22)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/master by this push: new b22e258 Feat team (#22) b22e258 is described below commit b22e25847b237d6d2d4aad64fb35fd33fdf49e33 Author: 琚致远 AuthorDate: Sun Mar 29 17:49:10 2020 +0800 Feat team (#22) * feat: remove public folder * feat: added team page --- .gitignore | 2 +- config.yaml | 4 + content/team/index.en.md | 210 +++ content/team/index.zh.md | 210 +++ public | 1 - 5 files changed, 425 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 14802e3..cc62783 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/public/* /resources/* .DS_Store +public diff --git a/config.yaml b/config.yaml index c17d5c9..ba08ac8 100644 --- a/config.yaml +++ b/config.yaml @@ -44,6 +44,8 @@ languages: sublinks: - title: Release Guide url: /contribute/release + - title: Team +url: /team language: name: 中 link: /zh @@ -128,6 +130,8 @@ languages: sublinks: - title: 发布指南 url: /zh/contribute/release +- title: 团队 + url: /zh/team language: name: EN link: / diff --git a/content/team/index.en.md b/content/team/index.en.md new file mode 100644 index 000..f52924d --- /dev/null +++ b/content/team/index.en.md @@ -0,0 +1,210 @@ +--- +title: "Team" +date: 2020-03-29T11:46:04+08:00 +include_footer: true +--- + + + +Members + +PPMC + + +ID +GitHub +Public Name + + + + https://whimsy.apache.org/roster/committer/yousa; target="_blank">yousa + +Miss-you +Hui Li + + + + https://whimsy.apache.org/roster/committer/shuaijinchao; target="_blank">shuaijinchao + +shuaijinchao +JinChao Shuai + + + + https://whimsy.apache.org/roster/committer/chenjunxu; target="_blank">chenjunxu + +nic-chen +Junxu Chen + + + + https://whimsy.apache.org/roster/committer/tangke; target="_blank">tangke + +supermario1990 +Ke Tang + + + + https://whimsy.apache.org/roster/committer/totemofwolf; target="_blank">totemofwolf + +totemofwolf +Lang Wang + + + + https://whimsy.apache.org/roster/committer/lizhiyong; target="_blank">lizhiyong + +zhiyong0804 +Li Zhiyong + + + + https://whimsy.apache.org/roster/committer/liling; target="_blank">liling + +lilien1010 +Ling Li + + + + https://whimsy.apache.org/roster/committer/linsir; target="_blank">linsir + +linsir +Linsir Wu + + + + https://whimsy.apache.org/roster/committer/moonming; target="_blank">wenming + +Ming Wen +Name + + + + https://whimsy.apache.org/roster/committer/wusheng; target="_blank">wusheng + +wu-sheng +Sheng Wu + + + + https://whimsy.apache.org/roster/committer/coolsoul; target="_blank">coolsoul + +soulsoul +Suo Zhang + + + + https://whimsy.apache.org/roster/committer/agile6v; target="_blank">agile6v + +agile6v +Wei Liu + + + + https://whimsy.apache.org/roster/committer/liyong; target="_blank">liyong + +chnliyong +Yong Li + + + + https://whimsy.apache.org/roster/committer/membphis; target="_blank">membphis + +membphis +YuanSheng Wang + + + + https://whimsy.apache.org/roster/committer/juzhiyuan; target="_blank">juzhiyuan + +juzhiyuan +Zhiyuan + + +Committers +The following list excludes PPMC members above. + + +ID +GitHub +Public Name + + + + https://whimsy.apache.org/roster/committer/akayeshmantha; target="_blank">akayeshmantha + +Akayeshmantha +Ayeshmantha Perera + + + + https://whimsy.apache.org/roster/committer/sshniro; target="_blank">sshniro + +sshniro +Nirojan Selvanathan + + + + https://whimsy.apache.org/roster/committer/spacewander; target="_blank">spacewander + +spacewander +Zexuan Luo + +
[GitHub] [incubator-apisix-website] juzhiyuan merged pull request #22: Feat team
juzhiyuan merged pull request #22: Feat team URL: https://github.com/apache/incubator-apisix-website/pull/22 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-apisix-website] branch asf-site updated: Publishing to asf-site (publish.sh)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 0b01d79 Publishing to asf-site (publish.sh) 0b01d79 is described below commit 0b01d798ea41bd765db4378e2c84a45a4780edbb Author: juzhiyuan AuthorDate: Sun Mar 29 17:49:43 2020 +0800 Publishing to asf-site (publish.sh) --- contribute/release/index.html| 6 + downloads/index.html | 6 + en/sitemap.xml | 17 +- index.html | 8 +- index.xml| 11 +- security/index.html | 6 + sitemap.xml | 4 +- team/index.html | 454 +++ zh/contribute/release/index.html | 6 + zh/downloads/index.html | 6 + zh/index.html| 8 +- zh/index.xml | 11 +- zh/security/index.html | 6 + zh/sitemap.xml | 17 +- zh/team/index.html | 454 +++ 15 files changed, 1012 insertions(+), 8 deletions(-) diff --git a/contribute/release/index.html b/contribute/release/index.html index 4778ff1..5bb4390 100644 --- a/contribute/release/index.html +++ b/contribute/release/index.html @@ -77,6 +77,9 @@ GnuPG-2.x可使用： + +Team + 中 @@ -122,6 +125,9 @@ GnuPG-2.x可使用： + + Team + 中 diff --git a/downloads/index.html b/downloads/index.html index 618ba32..9bbfcb6 100644 --- a/downloads/index.html +++ b/downloads/index.html @@ -70,6 +70,9 @@ + +Team + 中 @@ -115,6 +118,9 @@ + + Team + 中 diff --git a/en/sitemap.xml b/en/sitemap.xml index 6aebce4..9c46b6a 100644 --- a/en/sitemap.xml +++ b/en/sitemap.xml @@ -4,7 +4,7 @@ https://apisix.incubator.apache.org/ -2020-01-16T11:46:04+08:00 +2020-03-29T11:46:04+08:00 +https://apisix.incubator.apache.org/team/ +2020-03-29T11:46:04+08:00 +https://apisix.incubator.apache.org/zh/team/; +/> +https://apisix.incubator.apache.org/team/; +/> + + + https://apisix.incubator.apache.org/security/ 2020-01-16T11:46:04+08:00 https://apisix.incubator.apache.org/; /> - + @@ -72,6 +72,9 @@ + +Team + 中 @@ -117,6 +120,9 @@ + + Team + 中 diff --git a/index.xml b/index.xml index fffc9e6..46a976d 100644 --- a/index.xml +++ b/index.xml @@ -5,12 +5,21 @@ https://apisix.incubator.apache.org/ Recent content on Apache APISIX Hugo -- gohugo.io -Thu, 16 Jan 2020 11:46:04 +0800 +Sun, 29 Mar 2020 11:46:04 +0800 https://apisix.incubator.apache.org/index.xml; rel="self" type="application/rss+xml" /> + Team + https://apisix.incubator.apache.org/team/ + Sun, 29 Mar 2020 11:46:04 +0800 + + https://apisix.incubator.apache.org/team/ + Members PPMC ID GitHub Public Name yousa Miss-you Hui Li shuaijinchao shuaijinchao JinChao Shuai chenjunxu nic-chen Junxu Chen tangke supermario1990 Ke Tang totemofwolf totemofwolf Lang Wang lizhiyong zhiyong0804 Li Zhiyong liling lilien1010 Ling Li linsir linsir Linsir Wu wenming Ming Wen Name wusheng wu-sheng Sheng Wu coolsoul soulsoul Suo Zhang agile6v agile6v Wei Liu liyong chnliyong Yong Li membphis membphis YuanSheng Wang juzhiyuan j [...] + + + Security https://apisix.incubator.apache.org/security/ Thu, 16 Jan 2020 11:46:04 +0800 diff --git a/security/index.html b/security/index.html index fd9ba33..8d92ad0 100644 --- a/security/index.html +++ b/security/index.html @@ -71,6 +71,9 @@ If you have apprehensions regarding APISIX’s security or you discover vulnerab + +Team + 中 @@ -116,6 +119,9 @@ If you have apprehensions regarding APISIX’s security or you discover vulnerab + + Team + 中 diff --git a/sitemap.xml b/sitemap.xml index bceb604..938f799 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -4,14 +4,14 @@ https://apisix.incubator.apache.org/en/sitemap.xml - 2020-01-16T11:46:04+08:00 +
[incubator-apisix-website] branch asf-site updated: Publishing to asf-site (publish.sh)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/asf-site by this push: new f635cf8 Publishing to asf-site (publish.sh) f635cf8 is described below commit f635cf85988aad3f015d2cea77589c9be24bc1c2 Author: juzhiyuan AuthorDate: Sun Mar 29 18:19:55 2020 +0800 Publishing to asf-site (publish.sh) --- team/index.html| 2 +- zh/team/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/team/index.html b/team/index.html index 4e1d56b..20a364c 100644 --- a/team/index.html +++ b/team/index.html @@ -143,7 +143,7 @@ - + Members diff --git a/zh/team/index.html b/zh/team/index.html index b93c2e9..b0a70e2 100644 --- a/zh/team/index.html +++ b/zh/team/index.html @@ -143,7 +143,7 @@ - + 成员
[incubator-apisix-website] branch master updated: fix: team page styles
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/master by this push: new 147d5f6 fix: team page styles 147d5f6 is described below commit 147d5f67b98c19a98f61e6accaefbf3c754ff472 Author: juzhiyuan AuthorDate: Sun Mar 29 18:19:15 2020 +0800 fix: team page styles --- content/team/index.en.md | 2 +- content/team/index.zh.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/team/index.en.md b/content/team/index.en.md index 3eb14a4..ba3b2cc 100644 --- a/content/team/index.en.md +++ b/content/team/index.en.md @@ -4,7 +4,7 @@ date: 2020-03-29T11:46:04+08:00 include_footer: true --- - + Members diff --git a/content/team/index.zh.md b/content/team/index.zh.md index 125716c..4327eda 100644 --- a/content/team/index.zh.md +++ b/content/team/index.zh.md @@ -4,7 +4,7 @@ date: 2020-03-29T11:46:04+08:00 include_footer: true --- - + 成员
[GitHub] [incubator-apisix-website] juzhiyuan opened a new pull request #22: Feat team
juzhiyuan opened a new pull request #22: Feat team URL: https://github.com/apache/incubator-apisix-website/pull/22 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-apisix-website] 02/02: feat: added team page
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch feat-team in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git commit 0dcdd830dc54bc74d8209e7c181cd8971814a7d8 Author: juzhiyuan AuthorDate: Sun Mar 29 17:47:23 2020 +0800 feat: added team page --- config.yaml | 4 + content/team/index.en.md | 210 +++ content/team/index.zh.md | 210 +++ 3 files changed, 424 insertions(+) diff --git a/config.yaml b/config.yaml index c17d5c9..ba08ac8 100644 --- a/config.yaml +++ b/config.yaml @@ -44,6 +44,8 @@ languages: sublinks: - title: Release Guide url: /contribute/release + - title: Team +url: /team language: name: 中 link: /zh @@ -128,6 +130,8 @@ languages: sublinks: - title: 发布指南 url: /zh/contribute/release +- title: 团队 + url: /zh/team language: name: EN link: / diff --git a/content/team/index.en.md b/content/team/index.en.md new file mode 100644 index 000..f52924d --- /dev/null +++ b/content/team/index.en.md @@ -0,0 +1,210 @@ +--- +title: "Team" +date: 2020-03-29T11:46:04+08:00 +include_footer: true +--- + + + +Members + +PPMC + + +ID +GitHub +Public Name + + + + https://whimsy.apache.org/roster/committer/yousa; target="_blank">yousa + +Miss-you +Hui Li + + + + https://whimsy.apache.org/roster/committer/shuaijinchao; target="_blank">shuaijinchao + +shuaijinchao +JinChao Shuai + + + + https://whimsy.apache.org/roster/committer/chenjunxu; target="_blank">chenjunxu + +nic-chen +Junxu Chen + + + + https://whimsy.apache.org/roster/committer/tangke; target="_blank">tangke + +supermario1990 +Ke Tang + + + + https://whimsy.apache.org/roster/committer/totemofwolf; target="_blank">totemofwolf + +totemofwolf +Lang Wang + + + + https://whimsy.apache.org/roster/committer/lizhiyong; target="_blank">lizhiyong + +zhiyong0804 +Li Zhiyong + + + + https://whimsy.apache.org/roster/committer/liling; target="_blank">liling + +lilien1010 +Ling Li + + + + https://whimsy.apache.org/roster/committer/linsir; target="_blank">linsir + +linsir +Linsir Wu + + + + https://whimsy.apache.org/roster/committer/moonming; target="_blank">wenming + +Ming Wen +Name + + + + https://whimsy.apache.org/roster/committer/wusheng; target="_blank">wusheng + +wu-sheng +Sheng Wu + + + + https://whimsy.apache.org/roster/committer/coolsoul; target="_blank">coolsoul + +soulsoul +Suo Zhang + + + + https://whimsy.apache.org/roster/committer/agile6v; target="_blank">agile6v + +agile6v +Wei Liu + + + + https://whimsy.apache.org/roster/committer/liyong; target="_blank">liyong + +chnliyong +Yong Li + + + + https://whimsy.apache.org/roster/committer/membphis; target="_blank">membphis + +membphis +YuanSheng Wang + + + + https://whimsy.apache.org/roster/committer/juzhiyuan; target="_blank">juzhiyuan + +juzhiyuan +Zhiyuan + + +Committers +The following list excludes PPMC members above. + + +ID +GitHub +Public Name + + + + https://whimsy.apache.org/roster/committer/akayeshmantha; target="_blank">akayeshmantha + +Akayeshmantha +Ayeshmantha Perera + + + + https://whimsy.apache.org/roster/committer/sshniro; target="_blank">sshniro + +sshniro +Nirojan Selvanathan + + + + https://whimsy.apache.org/roster/committer/spacewander; target="_blank">spacewander + +spacewander +Zexuan Luo + + + + +Mentors + + +ID +GitHub +Public Name + + + + https://whimsy.apache.org/roster/committer/jmclean; target="_blank">jmclean + +justinmclean +Justin Mclean + + + + https://whimsy.apache.org/roster/committer/djkevincr; target="_blank">djkevincr + +djkevincr +Kevin Ratnasekera +
[incubator-apisix-website] branch feat-team created (now 0dcdd83)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch feat-team in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git. at 0dcdd83 feat: added team page This branch includes the following new commits: new 8adc44e feat: remove public folder new 0dcdd83 feat: added team page The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[incubator-apisix-website] 01/02: feat: remove public folder
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch feat-team in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git commit 8adc44e5e1b2a6a0414b1b32b7545d2a92b0c632 Author: juzhiyuan AuthorDate: Sun Mar 29 16:06:41 2020 +0800 feat: remove public folder --- .gitignore | 2 +- public | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 14802e3..cc62783 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/public/* /resources/* .DS_Store +public diff --git a/public b/public deleted file mode 16 index 03d9464..000 --- a/public +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 03d94649b382fce9827e37bbd66dc051bd325b73
[incubator-apisix-website] branch asf-site updated: Publishing to asf-site (publish.sh)
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new c5e8b2a Publishing to asf-site (publish.sh)
c5e8b2a is described below
commit c5e8b2aa08c24d202e2a099895320321c2bf6a5d
Author: juzhiyuan
AuthorDate: Sun Mar 29 18:16:36 2020 +0800
Publishing to asf-site (publish.sh)
---
{security => contribute/committer}/index.html| 51 +++-
contribute/index.xml | 15 +-
contribute/release/index.html| 6 +++
downloads/index.html | 6 +++
en/sitemap.xml | 37 +-
index.html | 6 +++
index.xml| 13 +
security/index.html | 6 +++
team/index.html | 9 +++-
zh/{security => contribute/committer}/index.html | 61 +++-
zh/contribute/index.xml | 25 +-
zh/contribute/release/index.html | 6 +++
zh/downloads/index.html | 6 +++
zh/index.html| 6 +++
zh/index.xml | 23 +
zh/security/index.html | 6 +++
zh/sitemap.xml | 31
zh/team/index.html | 9 +++-
18 files changed, 273 insertions(+), 49 deletions(-)
diff --git a/security/index.html b/contribute/committer/index.html
similarity index 77%
copy from security/index.html
copy to contribute/committer/index.html
index 8d92ad0..098a500 100644
--- a/security/index.html
+++ b/contribute/committer/index.html
@@ -3,13 +3,16 @@
-
-
+
+
-https://apisix.incubator.apache.org/security/; />
-
-
+https://apisix.incubator.apache.org/contribute/committer/; />
+
+
@@ -66,6 +69,9 @@ If you have apprehensions regarding APISIX’s security or you
discover vulnerab
+
+Committer Guide
+
Release Guide
@@ -114,6 +120,9 @@ If you have apprehensions regarding APISIX’s security or
you discover vulnerab
+
+ Committer Guide
+
Release Guide
@@ -133,17 +142,33 @@ If you have apprehensions regarding APISIX’s security or
you discover vulnerab
-Security
+Committer Guide
-
- The Apache Software Foundation takes a rigorous stance on eliminating
security issues in its software projects. Apache Incubator APISIX is also very
concerned Security issues related to its features and functionality.
-
- If you have apprehensions regarding APISIX’s security or you discover
vulnerability or potential threat, don’t hesitate to get in touch with the
Apache Security Team by dropping a mail at mailto:secur...@apache.org;>secur...@apache.org. Please specify the
project name as Incubator APISIX and its product name APISIX or
APISIX-Dashboard in the email and provide a description of the relevant problem
or potential threat. You are also urged to recommend the way to reproduce [...]
-
- Please pay attention to report the security issue on the security email
before disclosing it on public domain.
+
+
+Promotion
+The Apache APISIX community follows the http://community.apache.org/newcommitter.html;>Apache Community’s
process on accepting a new committer. After a contributor participates
APISIX's community actively, (P)PMC and Committers will make decisions to
invite the contributor join Committers and (P)PMC.
+Processes are:
+1. Start the discussion and vote in @private. Only current PMC member
could nominate;
+2. If the vote passes, send an offer to become a committer with
@private CC’ed;
+3. New committer signs ICLA and apply Apache ID and email address;
+4. Update Team page.
+
+
+
+Responsibilities
+1. Develop new features;
+2. Refactor codes;
+3. Review PR reliably and in time;
+4. Consider and accept feature requests;
+5. Answer questions;
+6. Update documentation and examples;
+7. Improve processes and tools;
+8. Guide new contributors join community.
+
diff --git a/contribute/index.xml b/contribute/index.xml
index 43fdd7e..46ec580 100644
--- a/contribute/index.xml
+++ b/contribute/index.xml
@@ -5,12 +5,25 @@
https://apisix.incubator.apache.org/contribute/
Recent content in Contributes on Apache APISIX
Hugo -- gohugo.io
-Tue, 07 Jan 2020 11:46:04 +0800
+Sun, 29 Mar 2020 11:46:04 +0800
[GitHub] [incubator-apisix-website] juzhiyuan closed issue #19: add committer page and team page
juzhiyuan closed issue #19: add committer page and team page URL: https://github.com/apache/incubator-apisix-website/issues/19 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-apisix-website] branch feat-committeer created (now f982ac6)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch feat-committeer in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git. at f982ac6 feat: added committer page No new revisions were added by this update.
[incubator-apisix-website] branch master updated: feat: added committer page (#23)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/master by this push: new 2414649 feat: added committer page (#23) 2414649 is described below commit 24146498869d1dc74031150605c93dace2cf4776 Author: 琚致远 AuthorDate: Sun Mar 29 18:15:59 2020 +0800 feat: added committer page (#23) --- config.yaml | 4 content/contribute/committer/index.en.md | 29 + content/contribute/committer/index.zh.md | 29 + content/team/index.en.md | 3 ++- content/team/index.zh.md | 3 ++- 5 files changed, 66 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index ba08ac8..70c9e18 100644 --- a/config.yaml +++ b/config.yaml @@ -42,6 +42,8 @@ languages: url: /downloads - title: Get Involved sublinks: +- title: Committer Guide + url: /contribute/committer - title: Release Guide url: /contribute/release - title: Team @@ -128,6 +130,8 @@ languages: url: /zh/downloads - title: 参与 sublinks: + - title: 提交者指南 +url: /zh/contribute/committer - title: 发布指南 url: /zh/contribute/release - title: 团队 diff --git a/content/contribute/committer/index.en.md b/content/contribute/committer/index.en.md new file mode 100644 index 000..09cfaac --- /dev/null +++ b/content/contribute/committer/index.en.md @@ -0,0 +1,29 @@ +--- +title: "Committer Guide" +date: 2020-03-29T11:46:04+08:00 +include_footer: true +--- + + + +Promotion +The Apache APISIX community follows the http://community.apache.org/newcommitter.html;>Apache Community’s process on accepting a new committer. After a contributor participates APISIX's community actively, (P)PMC and Committers will make decisions to invite the contributor join Committers and (P)PMC. +Processes are: +1. Start the discussion and vote in @private. Only current PMC member could nominate; +2. If the vote passes, send an offer to become a committer with @private CC’ed; +3. New committer signs ICLA and apply Apache ID and email address; +4. Update Team page. + + + +Responsibilities +1. Develop new features; +2. Refactor codes; +3. Review PR reliably and in time; +4. Consider and accept feature requests; +5. Answer questions; +6. Update documentation and examples; +7. Improve processes and tools; +8. Guide new contributors join community. + + \ No newline at end of file diff --git a/content/contribute/committer/index.zh.md b/content/contribute/committer/index.zh.md new file mode 100644 index 000..616e3a0 --- /dev/null +++ b/content/contribute/committer/index.zh.md @@ -0,0 +1,29 @@ +--- +title: "提交者指南" +date: 2020-03-29T11:46:04+08:00 +include_footer: true +--- + + + +加入提交者 +Apache APISIX 社区遵照 http://community.apache.org/newcommitter.html;>Apache 社区 流程来接受新的提交者，当一位贡献者非常活跃时，PMC、PPMC 以及提交者将共同决定是否邀请该贡献者加入社区。 +流程如下： +1. 在 @private 邮件列表中发起讨论，注意：当前只有 PMC 可以提名； +2. 如果投票通过，将发送邀请函以成为提交者，需 CC @private 邮件列表； +3. 新的提交者签署 ICLA 并提交有意愿的 Apache ID 与邮箱地址； +4. 更新 团队 页。 + + + +职责 +1. 开发新功能； +2. 重构代码； +3. 及时尽责地审阅 PR； +4. 讨论新的需求； +5. 回复提问； +6. 更新文档与示例； +7. 提升流程与相关工具； +8. 指导新的贡献者加入社区。 + + \ No newline at end of file diff --git a/content/team/index.en.md b/content/team/index.en.md index f52924d..3eb14a4 100644 --- a/content/team/index.en.md +++ b/content/team/index.en.md @@ -4,7 +4,7 @@ date: 2020-03-29T11:46:04+08:00 include_footer: true --- - + Members @@ -206,5 +206,6 @@ include_footer: true The Apache APISIX community follows the http://community.apache.org/newcommitter.html;>Apache Community’s process on accepting a new committer. After a contributor participates APISIX's community actively, (P)PMC and Committers will make decisions to invite the contributor join Committers and (P)PMC. +You can read Contributor Guide(TODO) to participate the community, and can get more information on Committer Guide. \ No newline at end of file diff --git a/content/team/index.zh.md b/content/team/index.zh.md index 20afcbe..125716c 100644 --- a/content/team/index.zh.md +++ b/content/team/index.zh.md @@ -4,7 +4,7 @@ date: 2020-03-29T11:46:04+08:00 include_footer: true --- - + 成员 @@ -206,5 +206,6 @@ include_footer: true Apache APISIX 社区遵照 http://community.apache.org/newcommitter.html;>Apache 社区 流程来接受新的提交者，当一位贡献者非常活跃时，PMC、PPMC 以及提交者将共同决定是否邀请该贡献者加入社区。 +你可以阅读贡献指南（TODO）以了解如何参加社区，也可以从 提交者指南 了解如何成为提交者。 \ No newline at end of file
[GitHub] [incubator-apisix-website] juzhiyuan opened a new pull request #23: feat: added committer page
juzhiyuan opened a new pull request #23: feat: added committer page URL: https://github.com/apache/incubator-apisix-website/pull/23 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix-website] juzhiyuan merged pull request #23: feat: added committer page
juzhiyuan merged pull request #23: feat: added committer page URL: https://github.com/apache/incubator-apisix-website/pull/23 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix-website] juzhiyuan edited a comment on issue #20: add community page
juzhiyuan edited a comment on issue #20: add community page URL: https://github.com/apache/incubator-apisix-website/issues/20#issuecomment-605637798 - [x] [Subscribe Guide](https://apisix.apache.org/zh/contribute/subscribe/) - [x] Contributor Guide - [x] Committer Guide - [ ] Code of Conduct - [ ] Documents Contributor Guide - [x] Release Guide - [ ] 2FA This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-apisix-website] branch master updated: feat: added Contributor guide
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git
The following commit(s) were added to refs/heads/master by this push:
new 279249e feat: added Contributor guide
279249e is described below
commit 279249e6af908a303049c1f9c8782180febc5e20
Author: juzhiyuan
AuthorDate: Sun Mar 29 22:19:14 2020 +0800
feat: added Contributor guide
---
config.yaml| 4 ++
content/contribute/contributor/index.en.md | 81 ++
content/contribute/contributor/index.zh.md | 81 ++
3 files changed, 166 insertions(+)
diff --git a/config.yaml b/config.yaml
index 346e282..e505a55 100644
--- a/config.yaml
+++ b/config.yaml
@@ -44,6 +44,8 @@ languages:
sublinks:
- title: Subscribe Guide
url: /contribute/subscribe
+- title: Contributor Guide
+ url: /contribute/contributor
- title: Committer Guide
url: /contribute/committer
- title: Release Guide
@@ -134,6 +136,8 @@ languages:
sublinks:
- title: 订阅指南
url: /zh/contribute/subscribe
+ - title: 贡献者指南
+url: /zh/contribute/contributor
- title: 提交者指南
url: /zh/contribute/committer
- title: 发布指南
diff --git a/content/contribute/contributor/index.en.md
b/content/contribute/contributor/index.en.md
new file mode 100644
index 000..c4f6bae
--- /dev/null
+++ b/content/contribute/contributor/index.en.md
@@ -0,0 +1,81 @@
+---
+title: "Contributor Guide"
+date: 2020-03-29T11:46:04+08:00
+include_footer: true
+---
+
+
+ Please fee free to report bugs, submit suggestions, or submit PRs
according to this guide.
+
+ Submit an issue
+ 1. Before submitting your issues, please go through a comprehensive
search to make sure the problem cannot be solved just by searching.
+ 2. Check the https://github.com/apache/incubator-apisix/issues;
target="_blank">Issue List to make sure the problem is not repeated.
+ 3. Create a new issue and choose the type of issue.
+ 4. Define the issue with a clear and descriptive title.
+ 5. Fill in necessary information according to the template.
+ 6. Choose a label after issue created.
+ 7. Please pay attention to your issue, you may need provide more
information during discussion.
+
+ Developer Flow
+
+ Fork repo
+ Fork the Apache APISIX repo to your own repo to work, then setting proper
upstream.
+
+ {{< highlight go "linenos=table" >}}
+ git remote add upstream https://github.com/apache/incubator-apisix.git
+ {{< / highlight >}}
+
+ Choose an issue
+
+ 1. Please choose your target issue. If it is a new issue discovered or a
new function enhancement to offer, please create an issue and set the right
label for it.
+ 2. After choosing the relevant issue, please reply with a deadline to
indicate that you are working on it.
+ 3. Find a mentor from the Team page and your mentor
will give you feedback about your PR or issue in time.
+
+ Create your branch
+
+ Switch to your forked master branch, pull codes from upstream, then
create a new branch.
+
+ {{< highlight go "linenos=table" >}}
+ $ git checkout master
+ $ git pull upstream master
+ $ git checkout -b IssueNo
+ {{< / highlight >}}
+
+ Notice: We will merge PR using squash, commit logs will
be different form upstream if you use one older branch.
+
+ Coding
+
+ 1. Please obey the Code of Conduct during the process of development and
finish the check before submitting the pull request.
+ 2. Then push codes to your fork repo.
+
+ {{< highlight go "linenos=table" >}}
+ $ git add modified-file-names
+ $ git commit -m 'commit message'
+ $ git push origin issueNo
+ {{< / highlight >}}
+
+ Submit PR
+
+ 1. Send a pull request to the master branch.
+ 2. The mentor will do codes review before discussing some details
(including the design, the implementation and the performance) with you.
+ 3. Then congratulate to you to be an official contributor of Apache
APISIX.
+
+ Delete branch
+
+ You can delete the remote branch (origin/IssueNo) and the local branch
(IssueNo) associated with the remote branch (origin/IssueNo) after the mentor
merged the PR into the master branch.
+
+ {{< highlight go "linenos=table" >}}
+ $ git checkout master
+ $ git branch -d IssueNo
+ $ git push origin --delete issueNo
+ {{< / highlight >}}
+
+ Notice
+
+ Please note that in order to show your ID in the contributor list, please
DO NOT forget to set the configurations below:
+
+ {{< highlight go "linenos=table" >}}
+ $ git config --global user.name "username"
+ $ git config --global user.email "mail address"
+ {{< / highlight >}}
+
\ No newline at end of file
diff --git a/content/contribute/contributor/index.zh.md
b/content/contribute/contributor/index.zh.md
new file mode 100644
index
[GitHub] [incubator-apisix] dabue commented on issue #1351: feature: remove `lua` dir.
dabue commented on issue #1351: feature: remove `lua` dir. URL: https://github.com/apache/incubator-apisix/pull/1351#issuecomment-605643900 that's good. 88786...@qq.com From: Wen Ming Date: 2020-03-29 10:08 To: apache/incubator-apisix CC: Subscribed Subject: Re: [apache/incubator-apisix] [WIP]feature: remove `lua` dir. (#1351) lua/apisix.lua → apisix.lua How about lua/apisix.lua → apisix/init.lua ? good idea — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub, or unsubscribe. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-apisix-website] branch asf-site updated: Publishing to asf-site (publish.sh)
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 12fd3fc Publishing to asf-site (publish.sh)
12fd3fc is described below
commit 12fd3fc86fb7e6ce79ef54efacdc1743ae6bb8fb
Author: juzhiyuan
AuthorDate: Sun Mar 29 22:28:58 2020 +0800
Publishing to asf-site (publish.sh)
---
contribute/{committer => 2fa}/index.html| 52 +
contribute/committer/index.html | 6
contribute/contributor/index.html | 6
contribute/index.xml| 10 ++
contribute/release/index.html | 6
contribute/subscribe/index.html | 6
downloads/index.html| 6
en/sitemap.xml | 15 +
index.html | 6
index.xml | 10 ++
security/index.html | 6
team/index.html | 6
zh/contribute/{subscribe => 2fa}/index.html | 39 +-
zh/contribute/committer/index.html | 6
zh/contribute/contributor/index.html| 6
zh/contribute/index.xml | 10 ++
zh/contribute/release/index.html| 6
zh/contribute/subscribe/index.html | 6
zh/downloads/index.html | 6
zh/index.html | 6
zh/index.xml| 10 ++
zh/security/index.html | 6
zh/sitemap.xml | 15 +
zh/team/index.html | 6
24 files changed, 212 insertions(+), 45 deletions(-)
diff --git a/contribute/committer/index.html b/contribute/2fa/index.html
similarity index 76%
copy from contribute/committer/index.html
copy to contribute/2fa/index.html
index 1c6dcd7..4ffad88 100644
--- a/contribute/committer/index.html
+++ b/contribute/2fa/index.html
@@ -3,14 +3,11 @@
-
-
+
+
-https://apisix.incubator.apache.org/contribute/committer/; />
+https://apisix.incubator.apache.org/contribute/2fa/; />
@@ -81,6 +78,9 @@ Processes are:
Release Guide
+
+2FA
+
@@ -138,6 +138,9 @@ Processes are:
Release Guide
+
+ 2FA
+
@@ -154,33 +157,24 @@ Processes are:
-Committer Guide
+2FA
-
-Promotion
-The Apache APISIX community follows the http://community.apache.org/newcommitter.html;>Apache Community’s
process on accepting a new committer. After a contributor participates
APISIX's community actively, (P)PMC and Committers will make decisions to
invite the contributor join Committers and (P)PMC.
-Processes are:
-1. Start the discussion and vote in @private. Only current PMC member
could nominate;
-2. If the vote passes, send an offer to become a committer with
@private CC’ed;
-3. New committer signs ICLA and apply Apache ID and email address;
-4. Update Team page.
-
-
-
-Responsibilities
-1. Develop new features;
-2. Refactor codes;
-3. Review PR reliably and in time;
-4. Consider and accept feature requests;
-5. Answer questions;
-6. Update documentation and examples;
-7. Improve processes and tools;
-8. Guide new contributors join community.
-
+Two-factor authentication(2FA)
+Two factor authentication (2FA) refers to the authentication method that
combines both passport and an object (credit card, SMS phone, token or
biomarkers as fingerprint) to identify a user. To ensure the security of the
committer’s account, we need you to enable 2FA to sign in and contribute codes
on GitHub. More details, please refer to https://help.github.com/articles/requiring-two-factor-authentication-in-your-organization/;
target="_blank">2FA.
+Note:If you do not enable 2FA, you will be removed from
the project and unable to access our repositories and the fork from our private
repository.
+
+Enable 2FA on GitHub
+For detailed operations, please refer to https://help.github.com/en/github/authenticating-to-github/configuring-two-factor-authentication;
target="_blank">Enable Two Factor Authentication with TOTP.
+After enabling 2FA, you need to sign in GitHub with the way of
username/password + mobile phone authentication code.
+Tips: If you cannot download the APP through the page
link, you can search and download the Google Authenticator in APP Store.
+
+How to Submit Codes
+After enabling 2FA, you need to
[GitHub] [incubator-apisix-website] juzhiyuan edited a comment on issue #20: add community page
juzhiyuan edited a comment on issue #20: add community page URL: https://github.com/apache/incubator-apisix-website/issues/20#issuecomment-605637798 - [x] [Subscribe Guide](https://apisix.apache.org/zh/contribute/subscribe/) - [x] Contributor Guide - [x] Committer Guide - [ ] Code of Conduct - [ ] Documents Contributor Guide - [x] Release Guide - [x] 2FA This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-apisix-website] branch master updated: feat: added 2fa
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/master by this push: new f75343b feat: added 2fa f75343b is described below commit f75343beeec9affe37c8985aef00fe453d9dbfc7 Author: juzhiyuan AuthorDate: Sun Mar 29 22:28:54 2020 +0800 feat: added 2fa --- config.yaml| 4 content/contribute/2fa/index.en.md | 20 content/contribute/2fa/index.zh.md | 20 3 files changed, 44 insertions(+) diff --git a/config.yaml b/config.yaml index e505a55..c00b4d9 100644 --- a/config.yaml +++ b/config.yaml @@ -50,6 +50,8 @@ languages: url: /contribute/committer - title: Release Guide url: /contribute/release +- title: 2FA + url: /contribute/2fa - title: Team url: /team language: @@ -142,6 +144,8 @@ languages: url: /zh/contribute/committer - title: 发布指南 url: /zh/contribute/release + - title: 两步验证 +url: /zh/contribute/2fa - title: 团队 url: /zh/team language: diff --git a/content/contribute/2fa/index.en.md b/content/contribute/2fa/index.en.md new file mode 100644 index 000..28edbef --- /dev/null +++ b/content/contribute/2fa/index.en.md @@ -0,0 +1,20 @@ +--- +title: "2FA" +date: 2020-03-29T11:46:04+08:00 +include_footer: true +--- + + +Two-factor authentication(2FA) +Two factor authentication (2FA) refers to the authentication method that combines both passport and an object (credit card, SMS phone, token or biomarkers as fingerprint) to identify a user. To ensure the security of the committer’s account, we need you to enable 2FA to sign in and contribute codes on GitHub. More details, please refer to https://help.github.com/articles/requiring-two-factor-authentication-in-your-organization/; target="_blank">2FA. +Note:If you do not enable 2FA, you will be removed from the project and unable to access our repositories and the fork from our private repository. + +Enable 2FA on GitHub +For detailed operations, please refer to https://help.github.com/en/github/authenticating-to-github/configuring-two-factor-authentication; target="_blank">Enable Two Factor Authentication with TOTP. +After enabling 2FA, you need to sign in GitHub with the way of username/password + mobile phone authentication code. +Tips: If you cannot download the APP through the page link, you can search and download the Google Authenticator in APP Store. + +How to Submit Codes +After enabling 2FA, you need to generate a private access Token to perform operations such as git submit and so on. At this time, you will use username + private access Token in replace of username + password to submit codes. +For detailed operations, please refer to https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line; target="_blank">Create a Private Token. + \ No newline at end of file diff --git a/content/contribute/2fa/index.zh.md b/content/contribute/2fa/index.zh.md new file mode 100644 index 000..0061ca1 --- /dev/null +++ b/content/contribute/2fa/index.zh.md @@ -0,0 +1,20 @@ +--- +title: "两步验证" +date: 2020-03-29T11:46:04+08:00 +include_footer: true +--- + + +Two-factor authentication(2FA) +Two factor authentication (2FA) refers to the authentication method that combines both passport and an object (credit card, SMS phone, token or biomarkers as fingerprint) to identify a user. To ensure the security of the committer’s account, we need you to enable 2FA to sign in and contribute codes on GitHub. More details, please refer to https://help.github.com/articles/requiring-two-factor-authentication-in-your-organization/; target="_blank">2FA. +Note:If you do not enable 2FA, you will be removed from the project and unable to access our repositories and the fork from our private repository. + +Enable 2FA on GitHub +For detailed operations, please refer to https://help.github.com/en/github/authenticating-to-github/configuring-two-factor-authentication; target="_blank">Enable Two Factor Authentication with TOTP. +After enabling 2FA, you need to sign in GitHub with the way of username/password + mobile phone authentication code. +Tips: If you cannot download the APP through the page link, you can search and download the Google Authenticator in APP Store. + +How to Submit Codes +After enabling 2FA, you need to generate a private access Token to perform operations such as git submit and so on. At this time, you will use username + private access Token in replace of username + password to submit codes. +For detailed operations, please refer to https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line; target="_blank">Create a Private Token. + \ No newline
[GitHub] [incubator-apisix] qiujiayu opened a new pull request #1361: check dns_addrs len
qiujiayu opened a new pull request #1361: check dns_addrs len URL: https://github.com/apache/incubator-apisix/pull/1361 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix-website] juzhiyuan opened a new issue #25: update the home page
juzhiyuan opened a new issue #25: update the home page URL: https://github.com/apache/incubator-apisix-website/issues/25 @moonming I just created the issue here. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] Akayeshmantha opened a new pull request #1363: update lua resty.
Akayeshmantha opened a new pull request #1363: update lua resty. URL: https://github.com/apache/incubator-apisix/pull/1363 ### Issues resolved Fix #1359 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] Akayeshmantha commented on issue #1359: travis: update the openresty to `1.15.8.3` for Tengine ENV
Akayeshmantha commented on issue #1359: travis: update the openresty to `1.15.8.3` for Tengine ENV URL: https://github.com/apache/incubator-apisix/issues/1359#issuecomment-605699145 @membphis will be working on this This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] sshniro commented on a change in pull request #1356: Updating TCP logger to use the batch processor util
sshniro commented on a change in pull request #1356: Updating TCP logger to use
the batch processor util
URL: https://github.com/apache/incubator-apisix/pull/1356#discussion_r399841751
##
File path: lua/apisix/plugins/tcp-logger.lua
##
@@ -48,51 +53,92 @@ function _M.check_schema(conf)
return core.schema.check(schema, conf)
end
-local function log(premature, conf, log_message)
-if premature then
-return
-end
+local function send_tcp_data(conf, log_message)
+local err_msg
+local res = true
+local sock, soc_err = tcp()
-local sock,err = tcp()
if not sock then
-core.log.error("failed to init the socket", err)
-return
+return nil, "failed to init the socket" .. soc_err
end
-sock:settimeout(conf.timeout)
+sock:settimeout(conf.timeout * 1000)
local ok, err = sock:connect(conf.host, conf.port)
if not ok then
-core.log.error("failed to connect to TCP server: host[",
-conf.host, "] port[", conf.port, "] ", err)
-return
+return nil, "failed to connect to TCP server: host[" ..
+conf.host .. "] port[" .. tostring(conf.port) .. "] err: " .. err
end
if conf.tls then
ok, err = sock:sslhandshake(true, conf.tls_options, false)
if not ok then
-core.log.error("failed to to perform TLS handshake to TCP server:
host[",
-conf.host, "] port[", conf.port, "] ", err)
-return
+return nil, "failed to to perform TLS handshake to TCP server:
host[" ..
+conf.host .. "] port[" .. tostring(conf.port) .. "] err: " ..
err
end
end
ok, err = sock:send(log_message)
if not ok then
-core.log.error("failed to send data to TCP server: host[",
-conf.host, "] port[", conf.port, "] ", err)
+res = false
+err_msg = "failed to send data to TCP server: host[" ..
+conf.host .. "] port[" .. tostring(conf.port) .. "] err: " .. err
end
ok, err = sock:close()
if not ok then
core.log.error("failed to close the TCP connection, host[",
-conf.host, "] port[", conf.port, "] ", err)
+conf.host, "] port[", conf.port, "] ", err)
end
+
+return res, err_msg
end
function _M.log(conf)
-return timer_at(0, log, conf, core.json.encode(log_util.get_full_log(ngx)))
+local entry = log_util.get_full_log(ngx)
+
+if not entry.route_id then
+core.log.error("failed to obtain the route id for udp logger")
+return
+end
+
+local log_buffer = buffers[entry.route_id]
+
+-- If a logger is not present for the route, create one
+if not log_buffer then
+-- Generate a function to be executed by the batch processor
+local func = function(entries, batch_max_size)
+local data
+if batch_max_size == 1 then
+data = core.json.encode(entries[1]) -- encode as single {}
Review comment:
Done
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-apisix] Akayeshmantha opened a new pull request #1364: support to run `header_filter` and `body_filter` phase for global rules.
Akayeshmantha opened a new pull request #1364: support to run `header_filter` and `body_filter` phase for global rules. URL: https://github.com/apache/incubator-apisix/pull/1364 ### Issues resolved Fix #1338 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] sshniro commented on a change in pull request #1356: Updating TCP logger to use the batch processor util
sshniro commented on a change in pull request #1356: Updating TCP logger to use
the batch processor util
URL: https://github.com/apache/incubator-apisix/pull/1356#discussion_r399841423
##
File path: lua/apisix/plugins/tcp-logger.lua
##
@@ -48,51 +53,92 @@ function _M.check_schema(conf)
return core.schema.check(schema, conf)
end
-local function log(premature, conf, log_message)
-if premature then
-return
-end
+local function send_tcp_data(conf, log_message)
+local err_msg
+local res = true
+local sock, soc_err = tcp()
-local sock,err = tcp()
if not sock then
-core.log.error("failed to init the socket", err)
-return
+return nil, "failed to init the socket" .. soc_err
end
-sock:settimeout(conf.timeout)
+sock:settimeout(conf.timeout * 1000)
local ok, err = sock:connect(conf.host, conf.port)
if not ok then
-core.log.error("failed to connect to TCP server: host[",
-conf.host, "] port[", conf.port, "] ", err)
-return
+return nil, "failed to connect to TCP server: host[" ..
+conf.host .. "] port[" .. tostring(conf.port) .. "] err: " .. err
end
if conf.tls then
ok, err = sock:sslhandshake(true, conf.tls_options, false)
if not ok then
-core.log.error("failed to to perform TLS handshake to TCP server:
host[",
-conf.host, "] port[", conf.port, "] ", err)
-return
+return nil, "failed to to perform TLS handshake to TCP server:
host[" ..
+conf.host .. "] port[" .. tostring(conf.port) .. "] err: " ..
err
end
end
ok, err = sock:send(log_message)
if not ok then
-core.log.error("failed to send data to TCP server: host[",
-conf.host, "] port[", conf.port, "] ", err)
+res = false
Review comment:
@membphis we cannot return here as we need to close the socket in the
following lines.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-apisix] sshniro commented on a change in pull request #1356: Updating TCP logger to use the batch processor util
sshniro commented on a change in pull request #1356: Updating TCP logger to use
the batch processor util
URL: https://github.com/apache/incubator-apisix/pull/1356#discussion_r399841448
##
File path: lua/apisix/plugins/tcp-logger.lua
##
@@ -48,51 +53,92 @@ function _M.check_schema(conf)
return core.schema.check(schema, conf)
end
-local function log(premature, conf, log_message)
-if premature then
-return
-end
+local function send_tcp_data(conf, log_message)
+local err_msg
+local res = true
+local sock, soc_err = tcp()
-local sock,err = tcp()
if not sock then
-core.log.error("failed to init the socket", err)
-return
+return nil, "failed to init the socket" .. soc_err
end
-sock:settimeout(conf.timeout)
+sock:settimeout(conf.timeout * 1000)
local ok, err = sock:connect(conf.host, conf.port)
if not ok then
-core.log.error("failed to connect to TCP server: host[",
-conf.host, "] port[", conf.port, "] ", err)
-return
+return nil, "failed to connect to TCP server: host[" ..
+conf.host .. "] port[" .. tostring(conf.port) .. "] err: " .. err
end
if conf.tls then
ok, err = sock:sslhandshake(true, conf.tls_options, false)
if not ok then
-core.log.error("failed to to perform TLS handshake to TCP server:
host[",
-conf.host, "] port[", conf.port, "] ", err)
-return
+return nil, "failed to to perform TLS handshake to TCP server:
host[" ..
+conf.host .. "] port[" .. tostring(conf.port) .. "] err: " ..
err
end
end
ok, err = sock:send(log_message)
if not ok then
-core.log.error("failed to send data to TCP server: host[",
-conf.host, "] port[", conf.port, "] ", err)
+res = false
+err_msg = "failed to send data to TCP server: host[" ..
+conf.host .. "] port[" .. tostring(conf.port) .. "] err: " .. err
end
ok, err = sock:close()
if not ok then
core.log.error("failed to close the TCP connection, host[",
-conf.host, "] port[", conf.port, "] ", err)
+conf.host, "] port[", conf.port, "] ", err)
end
+
+return res, err_msg
end
function _M.log(conf)
-return timer_at(0, log, conf, core.json.encode(log_util.get_full_log(ngx)))
+local entry = log_util.get_full_log(ngx)
+
+if not entry.route_id then
+core.log.error("failed to obtain the route id for udp logger")
+return
+end
+
+local log_buffer = buffers[entry.route_id]
Review comment:
Refactored.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-apisix] spacewander commented on a change in pull request #1364: support to run `header_filter` and `body_filter` phase for global rules.
spacewander commented on a change in pull request #1364: support to run
`header_filter` and `body_filter` phase for global rules.
URL: https://github.com/apache/incubator-apisix/pull/1364#discussion_r399881931
##
File path: lua/apisix.lua
##
@@ -435,11 +435,41 @@ end
function _M.http_header_filter_phase()
+local api_ctx = ngx.ctx.api_ctx
+if not api_ctx then
+return
+end
+
+if router.global_rules and router.global_rules.values
+and #router.global_rules.values > 0
+then
+local plugins = core.tablepool.fetch("plugins", 32, 0)
+for _, global_rule in ipairs(router.global_rules.values) do
+core.table.clear(plugins)
+plugins = plugin.filter(global_rule, plugins)
+run_plugin("header_filter")
Review comment:
Look like we should pass the `plugins` into `run_plugin`?
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-apisix] membphis commented on issue #1363: update lua resty.
membphis commented on issue #1363: update lua resty. URL: https://github.com/apache/incubator-apisix/pull/1363#issuecomment-605736508 the Travis will reuse the cached item first, I cleaned the caches right now, and run the test case again. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] membphis commented on issue #1362: request help: How to dump variable data for debugging
membphis commented on issue #1362: request help: How to dump variable data for
debugging
URL:
https://github.com/apache/incubator-apisix/issues/1362#issuecomment-605741018
There are two ways:
1. Use `json`.encode, the easiest, but not very convenient when viewing
2. Convert the request data into a hex string and output it in a format
similar to `tcpdump`
```
3f ee 8f 50 a0 2b ce d9 fd 5b 6d 15 08 b0 55 5a ?..P.+..
.[m...UZ
0010 aa 49 06 b4 e3 29 e4 af 90 56 8e e9 b7 2f 6a 36 .I...)..
.V.../j6
0020 b5 4c d7 4e 8b f5 26 01 b8 ef 03 dc 3f 45 4d 97 .L.N..&.
?EM.
0030 e8 5f a5 77 0f 69 cb e8 c9 f9 a3 e5 ._.w.i..
```
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[incubator-apisix-website] branch master updated: feat: update security page & added doc link
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git
The following commit(s) were added to refs/heads/master by this push:
new 421fd16 feat: update security page & added doc link
421fd16 is described below
commit 421fd1646c1cdf56aed94fc6ba76d2cdbeb0d73b
Author: juzhiyuan
AuthorDate: Mon Mar 30 10:08:30 2020 +0800
feat: update security page & added doc link
---
config.yaml | 12
content/{ => contribute}/security/index.en.md | 0
content/{ => contribute}/security/index.zh.md | 0
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/config.yaml b/config.yaml
index c00b4d9..bfacad5 100644
--- a/config.yaml
+++ b/config.yaml
@@ -36,8 +36,8 @@ languages:
navbar:
- title: Home
url: /
- - title: Security
-url: /security
+ - title: Docs
+url: https://github.com/apache/incubator-apisix/tree/master/doc
- title: Downloads
url: /downloads
- title: Get Involved
@@ -50,6 +50,8 @@ languages:
url: /contribute/committer
- title: Release Guide
url: /contribute/release
+- title: Security
+ url: /contribute/security
- title: 2FA
url: /contribute/2fa
- title: Team
@@ -130,8 +132,8 @@ languages:
navbar:
- title: 首页
url: /zh
-- title: 安全
- url: /zh/security
+- title: 文档
+ url: https://github.com/apache/incubator-apisix/tree/master/doc
- title: 下载
url: /zh/downloads
- title: 参与
@@ -144,6 +146,8 @@ languages:
url: /zh/contribute/committer
- title: 发布指南
url: /zh/contribute/release
+ - title: 安全
+url: /zh/contribute/security
- title: 两步验证
url: /zh/contribute/2fa
- title: 团队
diff --git a/content/security/index.en.md
b/content/contribute/security/index.en.md
similarity index 100%
rename from content/security/index.en.md
rename to content/contribute/security/index.en.md
diff --git a/content/security/index.zh.md
b/content/contribute/security/index.zh.md
similarity index 100%
rename from content/security/index.zh.md
rename to content/contribute/security/index.zh.md
[incubator-apisix-website] branch asf-site updated: Publishing to asf-site (publish.sh)
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new d7844f8 Publishing to asf-site (publish.sh)
d7844f8 is described below
commit d7844f824275d761ac660326e78dea7df246df16
Author: juzhiyuan
AuthorDate: Mon Mar 30 10:22:25 2020 +0800
Publishing to asf-site (publish.sh)
---
contribute/2fa/index.html| 14 ++
contribute/committer/index.html | 14 ++
contribute/contributor/index.html| 14 ++
contribute/index.xml | 10 ++
contribute/release/index.html| 14 ++
{security => contribute/security}/index.html | 16 +++-
contribute/subscribe/index.html | 14 ++
downloads/index.html | 14 ++
en/sitemap.xml | 6 +++---
index.html | 14 ++
index.xml| 4 ++--
team/index.html | 14 ++
zh/contribute/2fa/index.html | 14 ++
zh/contribute/committer/index.html | 14 ++
zh/contribute/contributor/index.html | 14 ++
zh/contribute/index.xml | 10 ++
zh/contribute/release/index.html | 14 ++
zh/{ => contribute}/security/index.html | 16 +++-
zh/contribute/subscribe/index.html | 14 ++
zh/downloads/index.html | 14 ++
zh/index.html| 14 ++
zh/index.xml | 4 ++--
zh/sitemap.xml | 6 +++---
zh/team/index.html | 14 ++
24 files changed, 212 insertions(+), 84 deletions(-)
diff --git a/contribute/2fa/index.html b/contribute/2fa/index.html
index 4ffad88..b4ed16d 100644
--- a/contribute/2fa/index.html
+++ b/contribute/2fa/index.html
@@ -54,8 +54,8 @@ Note:If you do not enable 2FA, you will be removed from the
project and unable t
Home
-
-Security
+ https://github.com/apache/incubator-apisix/tree/master/doc;
class="navbar-item is-secondary">
+Docs
Downloads
@@ -78,6 +78,9 @@ Note:If you do not enable 2FA, you will be removed from the
project and unable t
Release Guide
+
+Security
+
2FA
@@ -114,8 +117,8 @@ Note:If you do not enable 2FA, you will be removed from the
project and unable t
Home
-
- Security
+https://github.com/apache/incubator-apisix/tree/master/doc;
class="navbar-item is-secondary">
+ Docs
Downloads
@@ -138,6 +141,9 @@ Note:If you do not enable 2FA, you will be removed from the
project and unable t
Release Guide
+
+ Security
+
2FA
diff --git a/contribute/committer/index.html b/contribute/committer/index.html
index 31e18a5..95040ee 100644
--- a/contribute/committer/index.html
+++ b/contribute/committer/index.html
@@ -57,8 +57,8 @@ Processes are:
Home
-
-Security
+ https://github.com/apache/incubator-apisix/tree/master/doc;
class="navbar-item is-secondary">
+Docs
Downloads
@@ -81,6 +81,9 @@ Processes are:
Release Guide
+
+Security
+
2FA
@@ -117,8 +120,8 @@ Processes are:
Home
-
- Security
+https://github.com/apache/incubator-apisix/tree/master/doc;
class="navbar-item is-secondary">
+ Docs
Downloads
@@ -141,6 +144,9 @@ Processes are:
Release Guide
+
+ Security
+
2FA
diff --git a/contribute/contributor/index.html
b/contribute/contributor/index.html
index f409812..0807e21 100644
--- a/contribute/contributor/index.html
+++ b/contribute/contributor/index.html
@@ -57,8 +57,8 @@ Submit an issue 1. Before submitting your issues, please go
through a comprehens
Home
-
-Security
+
[GitHub] [incubator-apisix-website] juzhiyuan commented on issue #20: add community page
juzhiyuan commented on issue #20: add community page URL: https://github.com/apache/incubator-apisix-website/issues/20#issuecomment-605747887 DONE This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-apisix-website] branch asf-site updated: Publishing to asf-site (publish.sh)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/asf-site by this push: new ce78538 Publishing to asf-site (publish.sh) ce78538 is described below commit ce78538b96e25951a9addfde7be14c12c7d80c0e Author: juzhiyuan AuthorDate: Mon Mar 30 11:44:51 2020 +0800 Publishing to asf-site (publish.sh) --- contribute/2fa/index.html| 3 +-- contribute/committer/index.html | 3 +-- contribute/contributor/index.html| 3 +-- contribute/release/index.html| 3 +-- contribute/security/index.html | 3 +-- contribute/subscribe/index.html | 3 +-- downloads/index.html | 3 +-- index.html | 3 +-- team/index.html | 3 +-- zh/contribute/2fa/index.html | 3 +-- zh/contribute/committer/index.html | 3 +-- zh/contribute/contributor/index.html | 3 +-- zh/contribute/release/index.html | 3 +-- zh/contribute/security/index.html| 3 +-- zh/contribute/subscribe/index.html | 3 +-- zh/downloads/index.html | 3 +-- zh/index.html| 3 +-- zh/team/index.html | 3 +-- 18 files changed, 18 insertions(+), 36 deletions(-) diff --git a/contribute/2fa/index.html b/contribute/2fa/index.html index ffdad82..cb81352 100644 --- a/contribute/2fa/index.html +++ b/contribute/2fa/index.html @@ -204,9 +204,8 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t Downloads +中 - - 中 diff --git a/contribute/committer/index.html b/contribute/committer/index.html index 8019b5b..057d1c4 100644 --- a/contribute/committer/index.html +++ b/contribute/committer/index.html @@ -207,9 +207,8 @@ Processes are: Downloads +中 - - 中 diff --git a/contribute/contributor/index.html b/contribute/contributor/index.html index e34ca4f..d6a084a 100644 --- a/contribute/contributor/index.html +++ b/contribute/contributor/index.html @@ -207,9 +207,8 @@ Submit an issue 1. Before submitting your issues, please go through a comprehens Downloads +中 - - 中 diff --git a/contribute/release/index.html b/contribute/release/index.html index 8e169a6..0ca05b9 100644 --- a/contribute/release/index.html +++ b/contribute/release/index.html @@ -210,9 +210,8 @@ GnuPG-2.x可使用： Downloads +中 - - 中 diff --git a/contribute/security/index.html b/contribute/security/index.html index 0a318a4..ee547f2 100644 --- a/contribute/security/index.html +++ b/contribute/security/index.html @@ -204,9 +204,8 @@ If you have apprehensions regarding APISIX’s security or you discover vulnerab Downloads +中 - - 中 diff --git a/contribute/subscribe/index.html b/contribute/subscribe/index.html index ce55543..32bf00c 100644 --- a/contribute/subscribe/index.html +++ b/contribute/subscribe/index.html @@ -205,9 +205,8 @@ Downloads +中 - - 中 diff --git a/downloads/index.html b/downloads/index.html index 51f9268..61cedc4 100644 --- a/downloads/index.html +++ b/downloads/index.html @@ -203,9 +203,8 @@ Downloads +中 - - 中 diff --git a/index.html b/index.html index 9679b5c..7d3bf74 100644 --- a/index.html +++ b/index.html @@ -205,9 +205,8 @@ Downloads +中 - - 中 diff --git a/team/index.html b/team/index.html index 8513c61..35e3e73 100644 --- a/team/index.html +++ b/team/index.html @@ -203,9 +203,8 @@ Downloads +中 - - 中 diff --git a/zh/contribute/2fa/index.html b/zh/contribute/2fa/index.html index fe9e966..bb7437d 100644 --- a/zh/contribute/2fa/index.html +++ b/zh/contribute/2fa/index.html @@ -204,9 +204,8 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t 下载 +EN - - EN diff --git a/zh/contribute/committer/index.html b/zh/contribute/committer/index.html index fc5963f..ba4606b 100644 --- a/zh/contribute/committer/index.html +++ b/zh/contribute/committer/index.html @@ -217,9 +217,8 @@ 下载 +EN - - EN diff --git a/zh/contribute/contributor/index.html b/zh/contribute/contributor/index.html index 97ab0c3..c3519d9 100644 --- a/zh/contribute/contributor/index.html +++ b/zh/contribute/contributor/index.html @@ -207,9 +207,8 @@ Submit an issue 1. Before submitting your issues, please go through a comprehens 下载
[incubator-apisix-website] branch master updated: fix: language switcher position
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git
The following commit(s) were added to refs/heads/master by this push:
new 43bfaf5 fix: language switcher position
43bfaf5 is described below
commit 43bfaf54543c2f4bde50ce803bfc1657f678e7e5
Author: juzhiyuan
AuthorDate: Mon Mar 30 11:44:47 2020 +0800
fix: language switcher position
---
layouts/partials/navbar-clone.html | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/layouts/partials/navbar-clone.html
b/layouts/partials/navbar-clone.html
index 1070413..558f4c7 100644
--- a/layouts/partials/navbar-clone.html
+++ b/layouts/partials/navbar-clone.html
@@ -79,9 +79,8 @@
{{- end }}
{{- end }}
+{{
$language.name }}
-
- {{
$language.name }}
[GitHub] [incubator-apisix] sshniro opened a new issue #1362: request help: How to dump variable data for debugging
sshniro opened a new issue #1362: request help: How to dump variable data for debugging URL: https://github.com/apache/incubator-apisix/issues/1362 ### Issue description I'm using MQTT plugin to proxy some data to a broker. Before sending the data to upstream I want to parse and implement some custom security workflows. Thus how can I print all the request data for debugging? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] Akayeshmantha commented on issue #1358: Updating kafka logger to use the batch processor util
Akayeshmantha commented on issue #1358: Updating kafka logger to use the batch processor util URL: https://github.com/apache/incubator-apisix/pull/1358#issuecomment-605695853 Hi @sshniro I thin Kafka logger does not needs to use the batch processor since it already has the capability to push to the topic in an asynchronous way. Lua resty Kafka already has the feature already inbuilt I already mentioned that in the documentation file of the logger The message will write to the buffer first. It will send to the Kafka server when the buffer exceeds the batch_num, or every flush_time flush the buffer in Async mode cc :- @membphis wdyt ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] Akayeshmantha edited a comment on issue #1358: Updating kafka logger to use the batch processor util
Akayeshmantha edited a comment on issue #1358: Updating kafka logger to use the batch processor util URL: https://github.com/apache/incubator-apisix/pull/1358#issuecomment-605695853 Hi @sshniro I think Kafka logger does not needs to use the batch processor since it already has the capability to push to the topic in an asynchronous way. Lua resty Kafka already has the feature already inbuilt I already mentioned that in the documentation file of the logger The message will write to the buffer first. It will send to the Kafka server when the buffer exceeds the batch_num or every flush_time flush the buffer in Async mode cc :- @membphis wdyt ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] membphis commented on issue #1358: Updating kafka logger to use the batch processor util
membphis commented on issue #1358: Updating kafka logger to use the batch processor util URL: https://github.com/apache/incubator-apisix/pull/1358#issuecomment-605743635 @Akayeshmantha I agree with you. The current way is simpler and enough. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] spacewander opened a new issue #1365: Better to avoid responsing in header_filter_by_lua and body_filter_by_lua
spacewander opened a new issue #1365: Better to avoid responsing in header_filter_by_lua and body_filter_by_lua URL: https://github.com/apache/incubator-apisix/issues/1365 https://github.com/apache/incubator-apisix/blob/master/lua/apisix.lua#L142 ``` if phase ~= "log" then for i = 1, #plugins, 2 do local phase_fun = plugins[i][phase] if phase_fun then local code, body = phase_fun(plugins[i + 1], api_ctx) if code or body then core.response.exit(code, body) end end end return api_ctx end ``` Since `ngx.print` is meaningless after `content_by_lua`, maybe we can treat the filter phases as another log phase? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] membphis commented on issue #1363: update lua resty.
membphis commented on issue #1363: update lua resty. URL: https://github.com/apache/incubator-apisix/pull/1363#issuecomment-605738509 it failed, please take a look: https://travis-ci.org/github/apache/incubator-apisix/jobs/668486865?utm_medium=notification_source=github_status This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] membphis commented on a change in pull request #1356: Updating TCP logger to use the batch processor util
membphis commented on a change in pull request #1356: Updating TCP logger to use the batch processor util URL: https://github.com/apache/incubator-apisix/pull/1356#discussion_r399891484 ## File path: lua/apisix/plugins/tcp-logger.lua ## @@ -59,21 +59,21 @@ local function send_tcp_data(conf, log_message) local sock, soc_err = tcp() if not sock then -return nil, "failed to init the socket" .. soc_err +return false, "failed to init the socket" .. soc_err end -sock:settimeout(conf.timeout * 1000) +sock:settimeout(conf.timeout) local ok, err = sock:connect(conf.host, conf.port) if not ok then -return nil, "failed to connect to TCP server: host[" .. +return false, "failed to connect to TCP server: host[" .. conf.host .. "] port[" .. tostring(conf.port) .. "] err: " .. err Review comment: please fix other similar points This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] membphis commented on a change in pull request #1356: Updating TCP logger to use the batch processor util
membphis commented on a change in pull request #1356: Updating TCP logger to use the batch processor util URL: https://github.com/apache/incubator-apisix/pull/1356#discussion_r399891409 ## File path: lua/apisix/plugins/tcp-logger.lua ## @@ -59,21 +59,21 @@ local function send_tcp_data(conf, log_message) local sock, soc_err = tcp() if not sock then -return nil, "failed to init the socket" .. soc_err +return false, "failed to init the socket" .. soc_err end -sock:settimeout(conf.timeout * 1000) +sock:settimeout(conf.timeout) local ok, err = sock:connect(conf.host, conf.port) if not ok then -return nil, "failed to connect to TCP server: host[" .. +return false, "failed to connect to TCP server: host[" .. conf.host .. "] port[" .. tostring(conf.port) .. "] err: " .. err Review comment: Bad indentation, here is good style: ```lua return false, "failed to connect to TCP server: host[" .. conf.host .. "] port[" .. tostring(conf.port) .. "] err: " .. err ``` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] membphis commented on a change in pull request #1361: check dns_addrs len
membphis commented on a change in pull request #1361: check dns_addrs len
URL: https://github.com/apache/incubator-apisix/pull/1361#discussion_r399891051
##
File path: bin/apisix
##
@@ -702,7 +702,7 @@ local function init()
local dns_resolver = sys_conf["dns_resolver"]
if not dns_resolver or #dns_resolver == 0 then
local dns_addrs, err = local_dns_resolver("/etc/resolv.conf")
-if not dns_addrs then
+if not dns_addrs and #dns_addrs == 0 then
error("failed to import local DNS: " .. err)
Review comment:
the `err` may be a `nil` value if the length of `dns_addrs` is `0`
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[incubator-apisix-website] branch master updated: doc: add apache release begin from 0.9. (#26)
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/incubator-apisix-website.git The following commit(s) were added to refs/heads/master by this push: new e7af8ee doc: add apache release begin from 0.9. (#26) e7af8ee is described below commit e7af8eeecf27b18e9fae5575d543f48777c3b002 Author: Wen Ming AuthorDate: Mon Mar 30 12:57:27 2020 +0800 doc: add apache release begin from 0.9. (#26) --- config.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index f97b9f2..cfeeb68 100644 --- a/config.yaml +++ b/config.yaml @@ -16,7 +16,8 @@ languages: title: Apache APISIX # Hero subtitle (optional) subtitle1: Cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices. -subtitle2: APISIX is based on Nginx and etcd. Compared with traditional API gateways, APISIX has dynamic routing and plug-in hot loading, which is especially suitable for API management under micro-service system. +subtitle2: Apache APISIX is based on Nginx and etcd. Compared with traditional API gateways, APISIX has dynamic routing and plug-in hot loading, which is especially suitable for API management under micro-service system. +subtitle3: Apache releases are beginning from version 0.9. # Button text buttontext: View on GitHub # Where the main hero button links to @@ -105,6 +106,7 @@ languages: # Hero subtitle (optional) subtitle1: 云原生、高性能、可扩展的微服务 API 网关 subtitle2: 基于 Nginx 和 etcd 来实现，具备动态路由、插件热加载和 gRPC 代理和协议转换功能，更适合微服务体系下的 API 管理 + subtitle3: Apache release 从 0.9 版本开始 # Button text buttontext: 访问 GitHub # Where the main hero button links to
[GitHub] [incubator-apisix-website] moonming opened a new pull request #26: doc: add apache release begin from 0.9.
moonming opened a new pull request #26: doc: add apache release begin from 0.9. URL: https://github.com/apache/incubator-apisix-website/pull/26 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-apisix-website] 01/01: doc: add apache release begin from 0.9.
This is an automated email from the ASF dual-hosted git repository. wenming pushed a commit to branch desc in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git commit 633edb2561b3f48f8453de3e1f9024237e989a70 Author: WenMing AuthorDate: Mon Mar 30 12:56:37 2020 +0800 doc: add apache release begin from 0.9. --- config.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index f97b9f2..cfeeb68 100644 --- a/config.yaml +++ b/config.yaml @@ -16,7 +16,8 @@ languages: title: Apache APISIX # Hero subtitle (optional) subtitle1: Cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices. -subtitle2: APISIX is based on Nginx and etcd. Compared with traditional API gateways, APISIX has dynamic routing and plug-in hot loading, which is especially suitable for API management under micro-service system. +subtitle2: Apache APISIX is based on Nginx and etcd. Compared with traditional API gateways, APISIX has dynamic routing and plug-in hot loading, which is especially suitable for API management under micro-service system. +subtitle3: Apache releases are beginning from version 0.9. # Button text buttontext: View on GitHub # Where the main hero button links to @@ -105,6 +106,7 @@ languages: # Hero subtitle (optional) subtitle1: 云原生、高性能、可扩展的微服务 API 网关 subtitle2: 基于 Nginx 和 etcd 来实现，具备动态路由、插件热加载和 gRPC 代理和协议转换功能，更适合微服务体系下的 API 管理 + subtitle3: Apache release 从 0.9 版本开始 # Button text buttontext: 访问 GitHub # Where the main hero button links to
[GitHub] [incubator-apisix] moonming commented on issue #1363: update lua resty.
moonming commented on issue #1363: update lua resty. URL: https://github.com/apache/incubator-apisix/pull/1363#issuecomment-605739055 This file also contains many `openresty-1.15.8.2`, we better be unified into one. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-apisix] branch master updated: Batch Processor: Fix for rescheduling execution for max_retry_count is 0 and 1 (#1349)
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/incubator-apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 52934b5 Batch Processor: Fix for rescheduling execution for
max_retry_count is 0 and 1 (#1349)
52934b5 is described below
commit 52934b5fc78e4628ccdac35670438864fce90396
Author: Nirojan Selvanathan
AuthorDate: Mon Mar 30 03:44:33 2020 +0200
Batch Processor: Fix for rescheduling execution for max_retry_count is 0
and 1 (#1349)
---
lua/apisix/utils/batch-processor.lua | 27 ---
t/utils/batch-processor.t| 27 +--
2 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/lua/apisix/utils/batch-processor.lua
b/lua/apisix/utils/batch-processor.lua
index 4fcbe6e..4196095 100644
--- a/lua/apisix/utils/batch-processor.lua
+++ b/lua/apisix/utils/batch-processor.lua
@@ -17,7 +17,6 @@
local core = require("apisix.core")
local setmetatable = setmetatable
local timer_at = ngx.timer.at
-local fmt = string.format
local ipairs = ipairs
local table = table
local now = ngx.now
@@ -57,22 +56,20 @@ function execute_func(premature, batch_processor, batch)
return
end
-local ok, err = batch_processor.func(batch.entries)
+local ok, err = batch_processor.func(batch.entries,
batch_processor.batch_max_size)
if not ok then
+core.log.error("Batch Processor[", batch_processor.name, "] failed to
process entries: ", err)
batch.retry_count = batch.retry_count + 1
-if batch.retry_count < batch_processor.max_retry_count then
-core.log.warn(fmt("Batch Processor[%s] failed to process entries:
",
-batch_processor.name), err)
+if batch.retry_count <= batch_processor.max_retry_count then
schedule_func_exec(batch_processor, batch_processor.retry_delay,
batch)
else
-core.log.error(fmt(("Batch Processor[%s] exceeded the
max_retry_count[%d] "
-.. "dropping the entries"), batch_processor.name,
batch.retry_count))
+core.log.error("Batch Processor[", batch_processor.name,"]
exceeded ",
+"the max_retry_count[", batch.retry_count,"] dropping the
entries")
end
return
end
-core.log.debug(fmt("Batch Processor[%s] successfully processed the
entries",
-batch_processor.name))
+core.log.debug("Batch Processor[", batch_processor.name ,"] successfully
processed the entries")
end
@@ -83,15 +80,15 @@ local function flush_buffer(premature, batch_processor)
if now() - batch_processor.last_entry_t >=
batch_processor.inactive_timeout or
now() - batch_processor.first_entry_t >=
batch_processor.buffer_duration then
-core.log.debug(fmt("BatchProcessor[%s] buffer duration exceeded,
activating buffer flush",
-batch_processor.name))
+core.log.debug("Batch Processor[", batch_processor.name ,"] buffer ",
+"duration exceeded, activating buffer flush")
batch_processor:process_buffer()
batch_processor.is_timer_running = false
return
end
-- buffer duration did not exceed or the buffer is active, extending the
timer
-core.log.debug(fmt("BatchProcessor[%s] extending buffer timer",
batch_processor.name))
+core.log.debug("Batch Processor[", batch_processor.name ,"] extending
buffer timer")
create_buffer_timer(batch_processor)
end
@@ -152,7 +149,7 @@ function Batch_Processor:push(entry)
self.last_entry_t = now()
if self.batch_max_size <= #entries then
-core.log.debug(fmt("batch processor[%s] batch max size has exceeded",
self.name))
+core.log.debug("Batch Processor[", self.name ,"] batch max size has
exceeded")
self:process_buffer()
end
@@ -165,8 +162,8 @@ end
function Batch_Processor:process_buffer()
-- If entries are present in the buffer move the entries to processing
if #self.entry_buffer.entries > 0 then
-core.log.debug(fmt("tranferring buffer entries to processing pipe
line, buffercount[%d]",
-#self.entry_buffer.entries))
+core.log.debug("tranferring buffer entries to processing pipe line, ",
+"buffercount[", #self.entry_buffer.entries ,"]")
self.batch_to_process[#self.batch_to_process + 1] = self.entry_buffer
self.entry_buffer = { entries = {}, retry_count = 0 }
end
diff --git a/t/utils/batch-processor.t b/t/utils/batch-processor.t
index 4b3a569..2e930d1 100644
--- a/t/utils/batch-processor.t
+++ b/t/utils/batch-processor.t
@@ -122,7 +122,7 @@ GET /t
--- response_body
done
--- error_log
-BatchProcessor[log buffer] buffer duration exceeded, activating buffer flush
+Batch Processor[log buffer] buffer duration exceeded, activating buffer flush
Batch Processor[log buffer]
[GitHub] [incubator-apisix] moonming merged pull request #1349: Batch Processor: Fix for rescheduling execution for max_retry_count is 0 and 1
moonming merged pull request #1349: Batch Processor: Fix for rescheduling execution for max_retry_count is 0 and 1 URL: https://github.com/apache/incubator-apisix/pull/1349 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-apisix-website] branch asf-site updated: Publishing to asf-site (publish.sh)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 351b9f4 Publishing to asf-site (publish.sh) 351b9f4 is described below commit 351b9f42f3f46c49b0a282bdeb7f2d7be543e380 Author: juzhiyuan AuthorDate: Mon Mar 30 10:40:16 2020 +0800 Publishing to asf-site (publish.sh) --- contribute/2fa/index.html| 54 +++- contribute/committer/index.html | 54 +++- contribute/contributor/index.html| 54 +++- contribute/release/index.html| 54 +++- contribute/security/index.html | 54 +++- contribute/subscribe/index.html | 54 +++- downloads/index.html | 54 +++- index.html | 54 +++- team/index.html | 54 +++- zh/contribute/2fa/index.html | 54 +++- zh/contribute/committer/index.html | 54 +++- zh/contribute/contributor/index.html | 54 +++- zh/contribute/release/index.html | 54 +++- zh/contribute/security/index.html| 54 +++- zh/contribute/subscribe/index.html | 54 +++- zh/downloads/index.html | 54 +++- zh/index.html| 54 +++- zh/team/index.html | 54 +++- 18 files changed, 954 insertions(+), 18 deletions(-) diff --git a/contribute/2fa/index.html b/contribute/2fa/index.html index b4ed16d..1df55c8 100644 --- a/contribute/2fa/index.html +++ b/contribute/2fa/index.html @@ -89,6 +89,32 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t Team + + + ASF + + + + https://www.apache.org/; class="navbar-item"> +Foundation + + https://www.apache.org/licenses/; class="navbar-item"> +License + + https://www.apache.org/events/current-event; class="navbar-item"> +Events + + https://www.apache.org/security/; class="navbar-item"> +Security + + https://www.apache.org/foundation/sponsorship.html; class="navbar-item"> +SponsorShip + + https://www.apache.org/foundation/thanks.html; class="navbar-item"> +Thanks + + + 中 @@ -152,6 +178,32 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t Team + + +ASF + + + +https://www.apache.org/; class="navbar-item"> + Foundation + +https://www.apache.org/licenses/; class="navbar-item"> + License + +https://www.apache.org/events/current-event; class="navbar-item"> + Events + +https://www.apache.org/security/; class="navbar-item"> + Security + +https://www.apache.org/foundation/sponsorship.html; class="navbar-item"> + SponsorShip + +https://www.apache.org/foundation/thanks.html; class="navbar-item"> + Thanks + + + 中 @@ -272,7 +324,7 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t -Copyright © 2019 The Apache Software Foundation. Apache APISIX, and its feather logo are trademarks of The Apache Software Foundation. +Copyright © 2019-2020 The Apache Software Foundation. Apache APISIX, and its feather logo are trademarks of The Apache Software Foundation. diff --git a/contribute/committer/index.html b/contribute/committer/index.html index 95040ee..5987484 100644 --- a/contribute/committer/index.html +++ b/contribute/committer/index.html @@ -92,6 +92,32 @@ Processes are: Team + + + ASF + + + + https://www.apache.org/; class="navbar-item"> +Foundation + + https://www.apache.org/licenses/; class="navbar-item"> +
[incubator-apisix-website] branch master updated: feat: added ASF to the top menu
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/master by this push: new 7c30dd5 feat: added ASF to the top menu 7c30dd5 is described below commit 7c30dd5001746942a86820b3dddaaddbcf557934 Author: juzhiyuan AuthorDate: Mon Mar 30 10:39:10 2020 +0800 feat: added ASF to the top menu --- config.yaml | 28 layouts/partials/footer.html | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index bfacad5..da66a65 100644 --- a/config.yaml +++ b/config.yaml @@ -56,6 +56,20 @@ languages: url: /contribute/2fa - title: Team url: /team + - title: ASF +sublinks: +- title: Foundation + url: https://www.apache.org/ +- title: License + url: https://www.apache.org/licenses/ +- title: Events + url: https://www.apache.org/events/current-event +- title: Security + url: https://www.apache.org/security/ +- title: SponsorShip + url: https://www.apache.org/foundation/sponsorship.html +- title: Thanks + url: https://www.apache.org/foundation/thanks.html language: name: 中 link: /zh @@ -152,6 +166,20 @@ languages: url: /zh/contribute/2fa - title: 团队 url: /zh/team +- title: ASF + sublinks: + - title: 基金会 +url: https://www.apache.org/ + - title: 协议 +url: https://www.apache.org/licenses/ + - title: 事件 +url: https://www.apache.org/events/current-event + - title: 安全 +url: https://www.apache.org/security/ + - title: 赞助 +url: https://www.apache.org/foundation/sponsorship.html + - title: 致谢 +url: https://www.apache.org/foundation/thanks.html language: name: EN link: / diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index b23e2e0..7eabd0c 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -27,7 +27,7 @@ -Copyright © 2019 The Apache Software Foundation. Apache APISIX, and its feather logo are trademarks of The Apache Software Foundation. +Copyright © 2019-2020 The Apache Software Foundation. Apache APISIX, and its feather logo are trademarks of The Apache Software Foundation.
[incubator-apisix-website] branch master updated: feat: added ASF logos
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git
The following commit(s) were added to refs/heads/master by this push:
new 527b83e feat: added ASF logos
527b83e is described below
commit 527b83e81c9964abf2e0208f968dceaab9f3d596
Author: juzhiyuan
AuthorDate: Mon Mar 30 11:43:24 2020 +0800
feat: added ASF logos
---
assets/style.scss | 10 +++
config.yaml | 56
layouts/partials/footer.html| 20 +
layouts/partials/navbar.html| 2 +-
static/images/logos/apache_logo.png | Bin 0 -> 28237 bytes
5 files changed, 37 insertions(+), 51 deletions(-)
diff --git a/assets/style.scss b/assets/style.scss
index 9adc62c..2576bda 100644
--- a/assets/style.scss
+++ b/assets/style.scss
@@ -14,4 +14,14 @@
.warning {
font-weight: bold;
+}
+
+.navbar.is-fresh .navbar-brand img {
+ width: 300px;
+ height: 122px;
+ max-height: 122px;
+}
+
+.navbar.is-fresh .language-switcher {
+ margin-top: 0;
}
\ No newline at end of file
diff --git a/config.yaml b/config.yaml
index da66a65..f97b9f2 100644
--- a/config.yaml
+++ b/config.yaml
@@ -36,10 +36,8 @@ languages:
navbar:
- title: Home
url: /
- - title: Docs
+ - title: Documentation
url: https://github.com/apache/incubator-apisix/tree/master/doc
- - title: Downloads
-url: /downloads
- title: Get Involved
sublinks:
- title: Subscribe Guide
@@ -70,6 +68,8 @@ languages:
url: https://www.apache.org/foundation/sponsorship.html
- title: Thanks
url: https://www.apache.org/foundation/thanks.html
+ - title: Downloads
+url: /downloads
language:
name: 中
link: /zh
@@ -97,28 +97,6 @@ languages:
column1:
title: "Disclaimer"
text: Apache APISIX (incubating) is an effort undergoing
incubation at The Apache Software Foundation (ASF), sponsored by Incubator.
Incubation is required of all newly accepted projects until a further review
indicates that the infrastructure, communications, and decision making process
have stabilized in a manner consistent with other successful ASF projects.
While incubation status is not necessarily a reflection of the completeness or
stability of the code, it does indica [...]
- column2:
-title: "Documentation"
-links:
-- text: Overview
- link: https://github.com/apache/incubator-apisix#apisix
-- text: Quick start
- link: https://github.com/apache/incubator-apisix#quickstart
-- text: Developer guide
- link:
https://github.com/apache/incubator-apisix/blob/master/doc/architecture-design.md
- column3:
-title: "ASF"
-links:
-- text: Foundation
- link: http://www.apache.org/
-- text: License
- link: http://www.apache.org/licenses/
-- text: Events
- link: https://apachecon.com/?ref=apisix.incubator.apache.org
-- text: Sponsorship
- link: http://www.apache.org/foundation/sponsorship.html
-- text: Thanks
- link: http://www.apache.org/foundation/thanks.html
zh:
params:
hero:
@@ -148,8 +126,6 @@ languages:
url: /zh
- title: 文档
url: https://github.com/apache/incubator-apisix/tree/master/doc
-- title: 下载
- url: /zh/downloads
- title: 参与
sublinks:
- title: 订阅指南
@@ -180,6 +156,8 @@ languages:
url: https://www.apache.org/foundation/sponsorship.html
- title: 致谢
url: https://www.apache.org/foundation/thanks.html
+- title: 下载
+ url: /zh/downloads
language:
name: EN
link: /
@@ -207,28 +185,6 @@ languages:
column1:
title: "Disclaimer"
text: Apache APISIX (incubating) is an effort undergoing incubation
at The Apache Software Foundation (ASF), sponsored by Incubator. Incubation is
required of all newly accepted projects until a further review indicates that
the infrastructure, communications, and decision making process have stabilized
in a manner consistent with other successful ASF projects. While incubation
status is not necessarily a reflection of the completeness or stability of the
code, it does indicate [...]
-column2:
- title: "Documentation"
- links:
- - text: Overview
-link: https://github.com/apache/incubator-apisix#apisix
- - text: Quick start
-link: https://github.com/apache/incubator-apisix#quickstart
- - text: Developer guide
-link:
https://github.com/apache/incubator-apisix/blob/master/doc/architecture-design.md
-
[incubator-apisix-website] branch asf-site updated: Publishing to asf-site (publish.sh)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/asf-site by this push: new da21cbd Publishing to asf-site (publish.sh) da21cbd is described below commit da21cbdb7813b6a2f52691802ebfa4225e359973 Author: juzhiyuan AuthorDate: Mon Mar 30 11:43:32 2020 +0800 Publishing to asf-site (publish.sh) --- contribute/2fa/index.html | 100 ++--- contribute/committer/index.html| 100 ++--- contribute/contributor/index.html | 100 ++--- contribute/release/index.html | 100 ++--- contribute/security/index.html | 100 ++--- contribute/subscribe/index.html| 100 ++--- ...78e7086111cf57e29319e322f6257dde3e7c895348.css} | 2 +- downloads/index.html | 100 ++--- images/logos/apache_logo.png | Bin 0 -> 28237 bytes index.html | 100 ++--- team/index.html| 100 ++--- zh/contribute/2fa/index.html | 96 ++-- zh/contribute/committer/index.html | 96 ++-- zh/contribute/contributor/index.html | 96 ++-- zh/contribute/release/index.html | 96 ++-- zh/contribute/security/index.html | 96 ++-- zh/contribute/subscribe/index.html | 96 ++-- zh/downloads/index.html| 96 ++-- zh/index.html | 96 ++-- zh/team/index.html | 96 ++-- 20 files changed, 487 insertions(+), 1279 deletions(-) diff --git a/contribute/2fa/index.html b/contribute/2fa/index.html index 1df55c8..ffdad82 100644 --- a/contribute/2fa/index.html +++ b/contribute/2fa/index.html @@ -20,7 +20,7 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t https://fonts.googleapis.com/css?family=OpenSans:400,600; rel="stylesheet"> - + @@ -38,7 +38,7 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t - + @@ -55,10 +55,7 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t Home https://github.com/apache/incubator-apisix/tree/master/doc; class="navbar-item is-secondary"> -Docs - - -Downloads +Documentation @@ -115,8 +112,11 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t + +Downloads + + 中 -中 @@ -127,7 +127,7 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t - + @@ -144,10 +144,7 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t Home https://github.com/apache/incubator-apisix/tree/master/doc; class="navbar-item is-secondary"> - Docs - - - Downloads + Documentation @@ -204,6 +201,9 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t + + Downloads + 中 @@ -257,70 +257,26 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t - - - -Documentation - - - - - - -https://github.com/apache/incubator-apisix#apisix;> - Overview - - - -https://github.com/apache/incubator-apisix#quickstart;> - Quick start - - - -https://github.com/apache/incubator-apisix/blob/master/doc/architecture-design.md;> - Developer guide - - - + + + + + + + - - - -ASF - - - - - - -
[GitHub] [incubator-apisix-website] juzhiyuan commented on issue #25: update the home page
juzhiyuan commented on issue #25: update the home page URL: https://github.com/apache/incubator-apisix-website/issues/25#issuecomment-605777676 DONE, feel free to reopen it if there has new issues. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix-website] juzhiyuan closed issue #25: update the home page
juzhiyuan closed issue #25: update the home page URL: https://github.com/apache/incubator-apisix-website/issues/25 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] moonming merged pull request #1354: Adding test case for public key based introspection
moonming merged pull request #1354: Adding test case for public key based introspection URL: https://github.com/apache/incubator-apisix/pull/1354 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] membphis commented on issue #1365: Better to avoid responsing in header_filter_by_lua and body_filter_by_lua
membphis commented on issue #1365: Better to avoid responsing in header_filter_by_lua and body_filter_by_lua URL: https://github.com/apache/incubator-apisix/issues/1365#issuecomment-605739366 yes, you are right. we can print an error log message in this case. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-apisix] moonming closed issue #1276: add more test cases for oauth plugin
moonming closed issue #1276: add more test cases for oauth plugin URL: https://github.com/apache/incubator-apisix/issues/1276 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-apisix] branch master updated: Adding test case for public key based introspection (#1354)
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/incubator-apisix.git
The following commit(s) were added to refs/heads/master by this push:
new c340086 Adding test case for public key based introspection (#1354)
c340086 is described below
commit c3400867d58900b7ac133d83652db8ab22313ab6
Author: Nirojan Selvanathan
AuthorDate: Mon Mar 30 03:42:27 2020 +0200
Adding test case for public key based introspection (#1354)
---
t/plugin/openid-connect.t | 145 ++
1 file changed, 145 insertions(+)
diff --git a/t/plugin/openid-connect.t b/t/plugin/openid-connect.t
index 6699b0c..d6887d3 100644
--- a/t/plugin/openid-connect.t
+++ b/t/plugin/openid-connect.t
@@ -273,3 +273,148 @@ WWW-Authenticate: Bearer realm=apisix
--- no_error_log
[error]
--- SKIP
+
+
+
+=== TEST 8: update plugin public key
+--- config
+location /t {
+content_by_lua_block {
+local t = require("lib.test_admin").test
+local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+"plugins": {
+"openid-connect": {
+"client_id":
"kbyuFDidLLm280LIwVFiazOqjO3ty8KH",
+"client_secret":
"60Op4HFM0I8ajz0WdiStAbziZ-VFQttXuxixHHs2R7r7-CW8GR79l-mmLqMhc-Sa",
+"discovery":
"https://samples.auth0.com/.well-known/openid-configuration;,
+"redirect_uri": "https://iresty.com;,
+"ssl_verify": false,
+"timeout": 10,
+"bearer_only": true,
+"scope": "apisix",
+"public_key": "-BEGIN PUBLIC KEY-
+MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANW16kX5SMrMa2t7F2R1w6Bk/qpjS4QQ
+hnrbED3Dpsl9JXAx90MYsIWp51hBxJSE/EPVK8WF/sjHK1xQbEuDfEECAwEAAQ==
+-END PUBLIC KEY-",
+"token_signing_alg_values_expected": "RS256"
+}
+},
+"upstream": {
+"nodes": {
+"127.0.0.1:1980": 1
+},
+"type": "roundrobin"
+},
+"uri": "/hello"
+}]],
+[[{
+"node": {
+"value": {
+"plugins": {
+"openid-connect": {
+"client_id":
"kbyuFDidLLm280LIwVFiazOqjO3ty8KH",
+"client_secret":
"60Op4HFM0I8ajz0WdiStAbziZ-VFQttXuxixHHs2R7r7-CW8GR79l-mmLqMhc-Sa",
+"discovery":
"https://samples.auth0.com/.well-known/openid-configuration;,
+"redirect_uri": "https://iresty.com;,
+"ssl_verify": "no",
+"timeout": 1,
+"bearer_only": true,
+"scope": "apisix",
+"public_key": "-BEGIN PUBLIC KEY-
+MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANW16kX5SMrMa2t7F2R1w6Bk/qpjS4QQ
+hnrbED3Dpsl9JXAx90MYsIWp51hBxJSE/EPVK8WF/sjHK1xQbEuDfEECAwEAAQ==
+-END PUBLIC KEY-",
+"token_signing_alg_values_expected":
"RS256"
+}
+},
+"upstream": {
+"nodes": {
+"127.0.0.1:1980": 1
+},
+"type": "roundrobin"
+},
+"uri": "/hello"
+},
+"key": "/apisix/routes/1"
+},
+"action": "set"
+}]]
+)
+
+if code >= 300 then
+ngx.status = code
+end
+ngx.say(body)
+}
+}
+--- request
+GET /t
+--- response_body
+passed
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: access introspection with correct token
+--- config
+location /t {
+content_by_lua_block {
+local http = require "resty.http"
+local httpc = http.new()
+local uri = "http://127.0.0.1:; .. ngx.var.server_port .. "/hello"
+local res, err = httpc:request_uri(uri, {
+method = "GET",
+headers = {
+["Authorization"] = "Bearer
eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9" ..
+
[incubator-apisix-website] branch asf-site updated: Publishing to asf-site (publish.sh)
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 1a9b4ee Publishing to asf-site (publish.sh)
1a9b4ee is described below
commit 1a9b4ee1816d736381b4522fd506af76b99c461f
Author: juzhiyuan
AuthorDate: Sun Mar 29 21:39:11 2020 +0800
Publishing to asf-site (publish.sh)
---
contribute/committer/index.html | 6 +++
contribute/index.xml | 11 +
contribute/release/index.html | 6 +++
contribute/{committer => subscribe}/index.html| 44 +++---
downloads/index.html | 6 +++
en/sitemap.xml| 15 +++
index.html| 6 +++
index.xml | 13 +-
security/index.html | 6 +++
team/index.html | 14 --
zh/contribute/committer/index.html| 6 +++
zh/contribute/index.xml | 14 ++
zh/contribute/release/index.html | 6 +++
zh/contribute/{committer => subscribe}/index.html | 55 ---
zh/downloads/index.html | 6 +++
zh/index.html | 6 +++
zh/index.xml | 16 ++-
zh/security/index.html| 6 +++
zh/sitemap.xml| 15 +++
zh/team/index.html| 14 --
20 files changed, 198 insertions(+), 73 deletions(-)
diff --git a/contribute/committer/index.html b/contribute/committer/index.html
index 098a500..644d1c3 100644
--- a/contribute/committer/index.html
+++ b/contribute/committer/index.html
@@ -69,6 +69,9 @@ Processes are:
+
+Subscribe Guide
+
Committer Guide
@@ -120,6 +123,9 @@ Processes are:
+
+ Subscribe Guide
+
Committer Guide
diff --git a/contribute/index.xml b/contribute/index.xml
index 46ec580..37674bc 100644
--- a/contribute/index.xml
+++ b/contribute/index.xml
@@ -24,6 +24,17 @@ Processes are:
+ Subscribe Guide
+ https://apisix.incubator.apache.org/contribute/subscribe/
+ Sun, 29 Mar 2020 11:46:04 +0800
+
+ https://apisix.incubator.apache.org/contribute/subscribe/
+ During the process of using Apache APISIX, if there has any
problems, suggestion or new ideas, please feel free to use the Apache
mailing-list to participate in the community construction.
+1. Send e-mail to subscribe the mailing-list first. Use your mailbox to send
an e-mail to dev-subscr...@apisix.apache.org with any subjects or contents.
+2. Receive and reply the confirmation e-mail. After Step 1, you will receive a
confirmation e-mail from dev-help@apisix.
+
+
+
Release Guide
https://apisix.incubator.apache.org/contribute/release/
Tue, 07 Jan 2020 11:46:04 +0800
diff --git a/contribute/release/index.html b/contribute/release/index.html
index 3966451..146cc24 100644
--- a/contribute/release/index.html
+++ b/contribute/release/index.html
@@ -72,6 +72,9 @@ GnuPG-2.x可使用：
+
+Subscribe Guide
+
Committer Guide
@@ -123,6 +126,9 @@ GnuPG-2.x可使用：
+
+ Subscribe Guide
+
Committer Guide
diff --git a/contribute/committer/index.html b/contribute/subscribe/index.html
similarity index 79%
copy from contribute/committer/index.html
copy to contribute/subscribe/index.html
index 098a500..00d4d23 100644
--- a/contribute/committer/index.html
+++ b/contribute/subscribe/index.html
@@ -3,14 +3,12 @@
-
-
+
+
-https://apisix.incubator.apache.org/contribute/committer/; />
+https://apisix.incubator.apache.org/contribute/subscribe/; />
@@ -69,6 +67,9 @@ Processes are:
+
+Subscribe Guide
+
Committer Guide
@@ -120,6 +121,9 @@ Processes are:
+
+ Subscribe Guide
+
Committer Guide
@@ -142,32 +146,18 @@ Processes are:
-Committer Guide
+Subscribe Guide
-Promotion
-The Apache APISIX community follows the
[incubator-apisix-website] branch master updated: feat: added 订阅指南
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/master by this push: new 5ca02dc feat: added 订阅指南 new e721eee Merge branch 'master' of github.com:apache/incubator-apisix-website 5ca02dc is described below commit 5ca02dce1bdde48333c05bd927a2b72f5b5a24c8 Author: juzhiyuan AuthorDate: Sun Mar 29 21:38:06 2020 +0800 feat: added 订阅指南 --- config.yaml | 4 content/contribute/subscribe/index.en.md | 15 +++ content/contribute/subscribe/index.zh.md | 15 +++ 3 files changed, 34 insertions(+) diff --git a/config.yaml b/config.yaml index 70c9e18..346e282 100644 --- a/config.yaml +++ b/config.yaml @@ -42,6 +42,8 @@ languages: url: /downloads - title: Get Involved sublinks: +- title: Subscribe Guide + url: /contribute/subscribe - title: Committer Guide url: /contribute/committer - title: Release Guide @@ -130,6 +132,8 @@ languages: url: /zh/downloads - title: 参与 sublinks: + - title: 订阅指南 +url: /zh/contribute/subscribe - title: 提交者指南 url: /zh/contribute/committer - title: 发布指南 diff --git a/content/contribute/subscribe/index.en.md b/content/contribute/subscribe/index.en.md new file mode 100644 index 000..7a8ed58 --- /dev/null +++ b/content/contribute/subscribe/index.en.md @@ -0,0 +1,15 @@ +--- +title: "Subscribe Guide" +date: 2020-03-29T11:46:04+08:00 +include_footer: true +--- + + + + During the process of using Apache APISIX, if there has any problems, suggestion or new ideas, please feel free to use the Apache mailing-list to participate in the community construction. + 1. Send e-mail to subscribe the mailing-list first. Use your mailbox to send an e-mail to mailto:dev-subscr...@apisix.apache.org;>dev-subscr...@apisix.apache.org with any subjects or contents. + 2. Receive and reply the confirmation e-mail. After Step 1, you will receive a confirmation e-mail from dev-h...@apisix.apache.org (if you can not receive that, please check “RSS feeds”, “junk e-mail” or other items). Reply that e-mail directly or click the link in e-mail to reply, with any subjects or contents. + 3. Receive the Welcome e-mail. After finishing the two steps above, an e-mail with the subject of WELCOME to d...@apisix.apache.org will be sent to your e-mail address. Until now, you have succeeded in subscribing Apache Incubating APISIX mailing-list. + 4. Until now, you can interact with community by your subscribed email or track email conversations by Archived email list. + + \ No newline at end of file diff --git a/content/contribute/subscribe/index.zh.md b/content/contribute/subscribe/index.zh.md new file mode 100644 index 000..d1148cc --- /dev/null +++ b/content/contribute/subscribe/index.zh.md @@ -0,0 +1,15 @@ +--- +title: "订阅指南" +date: 2020-03-29T11:46:04+08:00 +include_footer: true +--- + + + + 在使用 Apache APISIX 的过程中，若遇到任何问题，或有建议、想法，请大胆地使用 Appache 邮件列表与社区成员互动。 + 1. 发送邮件以订阅：使用你的常用邮箱，发送一封包含任意内容的邮件至 mailto:dev-subscr...@apisix.apache.org;>dev-subscr...@apisix.apache.org 。 + 2. 发送确认订阅邮件：第一步完成后，你将收到一封来自 dev-h...@apisix.apache.org 的邮件，（若没有收到，请稍后检查诸如 RSS Feeds、垃圾邮件等选项卡）。接着，请回复任意内容至该邮件，以便完成订阅确认。 + 3. 接收欢迎邮件：完成上述步骤后，你将收到一封题为 WELCOME to d...@apisix.apache.org 的邮件，这表示你已成功订阅该邮件列表。 + 4. 此后，你将可以通过该邮箱收到 Apache APISIX 最新的邮件，也欢迎你通过邮件列表与社区交流！ + + \ No newline at end of file
