[incubator-apisix] branch master updated: bugfix: installed lua file in folder `lua/apisix/utils` . (#1342)

[membphis]

This is an automated email from the ASF dual-hosted git repository.

membphis 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 94cc688  bugfix: installed lua file in folder `lua/apisix/utils` . 
(#1342)
94cc688 is described below

commit 94cc688fc169bafc77483d0a796bb30d224ce756
Author: YuanSheng Wang <membp...@gmail.com>
AuthorDate: Fri Mar 27 07:34:08 2020 +0800

    bugfix: installed lua file in folder `lua/apisix/utils` . (#1342)
---
 .travis/linux_apisix_current_luarocks_runner.sh | 7 +++++++
 .travis/linux_apisix_master_luarocks_runner.sh  | 6 ++++++
 Makefile                                        | 3 +++
 utils/check-lua-code-style.sh                   | 2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.travis/linux_apisix_current_luarocks_runner.sh 
b/.travis/linux_apisix_current_luarocks_runner.sh
index 12fcb15..7c30dc3 100755
--- a/.travis/linux_apisix_current_luarocks_runner.sh
+++ b/.travis/linux_apisix_current_luarocks_runner.sh
@@ -54,6 +54,13 @@ script() {
     # apisix cli test
     sudo PATH=$PATH .travis/apisix_cli_test.sh
 
+    cat /usr/local/apisix/logs/error.log | grep '\[error\]' > /tmp/error.log | 
true
+    if [ -s /tmp/error.log ]; then
+        echo "=====found error log====="
+        cat /usr/local/apisix/logs/error.log
+        exit 1
+    fi
+
     sudo luarocks remove rockspec/apisix-master-0.rockspec
 }
 
diff --git a/.travis/linux_apisix_master_luarocks_runner.sh 
b/.travis/linux_apisix_master_luarocks_runner.sh
index e1fe268..7be6389 100755
--- a/.travis/linux_apisix_master_luarocks_runner.sh
+++ b/.travis/linux_apisix_master_luarocks_runner.sh
@@ -64,6 +64,12 @@ script() {
     # apisix cli test
     sudo PATH=$PATH .travis/apisix_cli_test.sh
 
+    cat /usr/local/apisix/logs/error.log | grep '\[error\]' > /tmp/error.log | 
true
+    if [ -s /tmp/error.log ]; then
+        echo "=====found error log====="
+        cat /usr/local/apisix/logs/error.log
+    fi
+
     sudo luarocks remove rockspec/apisix-master-0.rockspec
 }
 
diff --git a/Makefile b/Makefile
index 780dc1e..a695765 100644
--- a/Makefile
+++ b/Makefile
@@ -156,6 +156,9 @@ install:
        $(INSTALL) -d $(INST_LUADIR)/apisix/lua/apisix/stream/router
        $(INSTALL) lua/apisix/stream/router/*.lua 
$(INST_LUADIR)/apisix/lua/apisix/stream/router/
 
+       $(INSTALL) -d $(INST_LUADIR)/apisix/lua/apisix/utils
+       $(INSTALL) lua/apisix/utils/*.lua 
$(INST_LUADIR)/apisix/lua/apisix/utils/
+
        $(INSTALL) README.md $(INST_CONFDIR)/README.md
        $(INSTALL) bin/apisix $(INST_BINDIR)/apisix
 
diff --git a/utils/check-lua-code-style.sh b/utils/check-lua-code-style.sh
index 7e67a83..9a73bfa 100755
--- a/utils/check-lua-code-style.sh
+++ b/utils/check-lua-code-style.sh
@@ -32,7 +32,7 @@ luacheck -q lua
     lua/apisix/plugins/limit-count/*.lua > \
     /tmp/check.log 2>&1 || (cat /tmp/check.log && exit 1)
 
-count=`grep -E ".lua:[0-9]+:" /tmp/check.log -c || true`
+count=`grep -E ".lua:[0-9]+:" /tmp/check.log -c | true`
 
 if [ $count -ne 0 ]
 then