Merge branch 'master' of https://github.com/Tinywan/lua_project_v0.01 into company

Author: Tinywan

README.md

@@ -2,10 +2,6 @@
 ------
 ##  Wiki manual
 [https://github.com/Tinywan/lua_project_v0.01/wiki](https://github.com/Tinywan/lua_project_v0.01/wiki)
-## branch list
-+   master分支已经很稳定了，将不再提交代码，以后将从以下分支提交
-+   公司`company`分支
-+   家里`home`分支
 ##  Project structure
 ```javascript
 .
@@ -83,66 +79,79 @@
         ├── index.html
         └── js
 ```
+## Openresty Installation
++   Prerequisites：`apt-get install libreadline-dev libncurses5-dev libpcre3-dev libssl-dev perl make build-essential`
++   Building：
+    ```bash
+    wget https://openresty.org/download/openresty-1.11.2.1.tar.gz
+    tar xvf openresty-1.11.2.1.tar.gz
+    cd openresty-1.11.2.1
+    ./configure --prefix=/opt/openresty \
+                --with-pcre-jit \
+                --with-ipv6 \
+                --without-http_redis2_module \
+                --with-http_iconv_module \
+                --with-http_postgres_module \
+                -j2
+    make
+    sudo make install
+    ```
+    
 ## nginx.conf, the Nginx web server configuration
 
 ```bash
 user  www www;
 worker_processes  8;
 
 pid        logs/nginx.pid;
+worker_rlimit_nofile 204800;
 
 events {
     use epoll;
-    worker_connections  1024;
+    worker_connections  204800;
 }
 
 http {
     include       /opt/openresty/nginx/conf/mime.types;
     default_type  text/html;
+    charset  utf-8;
     lua_package_path "/mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/lualib/?.lua;;";  #lua 模块
     lua_package_cpath "/mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/lualib/?.so;;";  #c模块
     include "/mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/conf/domains/*";
 }
 ```
-## Openresty安装
-+   环境：`apt-get install libreadline-dev libncurses5-dev libpcre3-dev libssl-dev perl make build-essential`
-+   下载,编译：
-    ```bash
-    wget https://openresty.org/download/openresty-1.11.2.1.tar.gz
-    tar xvf openresty-1.11.2.1.tar.gz
-    cd openresty-1.11.2.1
-    ./configure --prefix=/opt/openresty --with-luajit --with-http_iconv_module
-    make
-    sudo make install
-    ```
-## 如何安装使用
-+   修改主配置文件：`lua_project_v0.01/conf/nginx.conf` 的路径,一下的`/home/`修改为项目所在路径
+## How to use
++   修改主配置文件：`lua_project_v0.01/conf/nginx.conf` 的路径,以下的`/home/`修改为项目所在路径
     ```bash
     lua_package_path "/home/lua_project_v0.01/lualib/?.lua;/home/lua_project_v0.01/application/controller/?.lua";#lua 模块
     lua_package_cpath "/home/lua_project_v0.01/lualib/?.so;;";          #  c模块
     include "/home/lua_project_v0.01/conf/domains/*";
     ```
 +   测试配置文件：`test.conf`
 +   修改项目路径变量：`set $project_path /home/;`
-    +   日志文件不支持变量(暂时是写死，以后在做处理)：`access_log  "/home/lua_project_v0.01/logs/demo_access.log";`
+    +   日志文件路径不支持变量(暂时需要修改，以后直接做跨域保存就可以了)：`access_log  "/home/lua_project_v0.01/logs/demo_access.log";`
 +   启动脚本
     +   赋予权限（655）：`chmod +x /start.sh `,
     +   配置成功运行结果如下：
         ```bash
-        /home/lua_project_v0.01/conf# ../bin/start.sh 
+        /home/lua_project_v0.01/conf# ../bin/start.sh start
          [ Stop OK ] 
         nginx: the configuration file /home/lua_project_v0.01/conf/nginx.conf syntax is ok
         nginx: configuration file /home/lua_project_v0.01/conf/nginx.conf test is successful
          [ Start OK ]
         ```
-+   测试流程是否跑通：`curl http://127.0.0.1/test`,输出："Hello! lua_project_v0.01"，表示Ok        
-## config 配置文件列表(为了测试方便)
++   测试流程是否跑通：`curl http://127.0.0.1/`,输出：`Hello! lua_project_v0.01`，表示环境配置成功
+## branch list
++   master分支已经很稳定了，将不再提交代码，以后将从以下分支提交
++   公司`company`分支
++   家里`home`分支       
+## config list
 +   API接口专用（8686）：`api.conf`
 +   Demo测试专用（8080）：`nginx_demo.conf`
 +   活动直播专用（8088）：`nginx_live.conf`
 +   Waf防火墙专用（8082）：`waf.conf`
 +   商品列表专用（8083）：`nginx_product.conf`
-##  错误问题
+##  error infomation
 +   [解决nginx: [emerg] bind() to [::]:80 failed (98: Address already in use)](http://www.sjsjw.com/kf_system/article/167_16951_30655.asp)
 +   错误日志：`[crit] 3478#0: *5 connect() to unix:/var/run/php7.0.9-fpm.sock failed (13: Permission denied)`
     +   修改php-fpm.conf配置文件

application/controller/WebSocketRedisController.lua

@@ -16,7 +16,7 @@ local channel_name, err = live_room:get("chat")
 if channel_name then
     log(ngx.ERR, " resty.websocket.server :: ",err) -- tag data origin
 end
-local redis_host = "121.41.88.209"
+local redis_host = "127.0.0.1"
 local redis_port = 63789
 local redis_auth = "tinywanredisamaistream"
 local redis_timeout = 1000
@@ -36,7 +36,7 @@ end
 local push = function()
     -- --create redis
     local red = redis:new()
-    red:set_timeout(5000) -- 1 sec
+    red:set_timeout(redis_timeout) -- 1 sec
     local ok, err = red:connect(redis_host, redis_port)
     if not ok then
         ngx.log(ngx.ERR, "failed to connect redis: ", err)
@@ -108,7 +108,7 @@ while true do
     elseif typ == "text" then
         --send to redis
         local red2 = redis:new()
-        red2:set_timeout(1000) -- 1 sec
+        red2:set_timeout(redis_timeout) -- 1 sec
         local ok, err = red2:connect(redis_host, redis_port)
         if not ok then
             ngx.log(ngx.ERR, "failed to connect redis: ", err)

bin/start.sh

@@ -1,20 +1,58 @@
 #!/bin/bash
-#get nginx.conf path
-#CONF_FILE_PATH=$(sudo find / -type f -name 'nginx.conf' | grep lua_project_v0.01 | xargs ls)
-# get Nginx Pid
+#######################################################
+# $Name:         start.sh
+# $Version:      v1.0
+# $Function:     Nginx start script
+# $Author:       ShaoBo Wan (Tinywan)
+# $organization: https://github.com/Tinywan
+# $Create Date:  2017-07-05
+# $Description:  Nginx start script
+#######################################################
+# update 1
+NGINX_SBIN_PATH="/opt/openresty/nginx/sbin/nginx"
+# update 1
+NGINX_CONFIG_PATH="/mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/conf/nginx.conf"
 PID=$(ps -aef | grep nginx | grep -v grep | grep master |awk '{print $2}')
-if [[ $? == 0 && -n $PID ]]
-then
-    echo -e "\033[35m [ Nginx running ] \033[0m"
-    #确认nginx配置文件的语法是否正确，否则nginx将不会加载新的配置文件
-    sudo /opt/openresty/nginx/sbin/nginx  -t -c /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/conf/nginx.conf
-    #sudo /opt/openresty/nginx/sbin/nginx  -s reload
-    sudo kill -HUP $PID
-    echo -e "\033[33m [ Nginx has reload ] \033[0m"
-else
-    echo -e "\033[31m [ Stop OK ] \033[0m"
-    sudo /opt/openresty/nginx/sbin/nginx  -t -c /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/conf/nginx.conf
-    sudo /opt/openresty/nginx/sbin/nginx  -c /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/conf/nginx.conf
-    echo -e "\033[32m [ Start OK ] \033[0m"
-fi
-exit 1
+shell_usage(){
+    echo $"Usage: $0 start|stop"
+}
+
+start_nginx(){
+    if [[ $? == 0 && -n $PID ]]
+    then
+        echo -e "\033[35m [ Nginx running ] \033[0m"
+        sudo $NGINX_SBIN_PATH  -t -c $NGINX_CONFIG_PATH
+        sudo kill -HUP $PID
+        echo -e "\033[33m [ Nginx has reload ] \033[0m"
+    else
+        echo -e "\033[31m [ Stop OK ] \033[0m"
+        sudo $NGINX_SBIN_PATH  -t -c $NGINX_CONFIG_PATH
+        sudo $NGINX_SBIN_PATH  -c $NGINX_CONFIG_PATH
+        echo -e "\033[32m [ Start OK ] \033[0m"
+    fi
+}
+
+stop_nginx(){
+    sudo kill -QUIT ${PID}
+    if [[ $? == 0 &&  -n $PID ]]
+    then
+        echo -e "\033[33m [ Stop Success ] \033[0m"
+    else
+        echo -e "\033[31m [ Stop Fail ] \033[0m"
+    fi
+    exit 1
+}
+
+# Main Function
+main(){
+    case $1 in
+        start) start_nginx
+        ;;
+        stop) stop_nginx
+        ;;
+        *) shell_usage
+        ;;
+    esac
+}
+
+main $1

bin/start.sh.bak

@@ -0,0 +1,20 @@
+#!/bin/bash
+#get nginx.conf path
+#CONF_FILE_PATH=$(sudo find / -type f -name 'nginx.conf' | grep lua_project_v0.01 | xargs ls)
+# get Nginx Pid
+PID=$(ps -aef | grep nginx | grep -v grep | grep master |awk '{print $2}')
+if [[ $? == 0 && -n $PID ]]
+then
+    echo -e "\033[35m [ Nginx running ] \033[0m"
+    #确认nginx配置文件的语法是否正确，否则nginx将不会加载新的配置文件
+    sudo /opt/openresty/nginx/sbin/nginx  -t -c /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/conf/nginx.conf
+    #sudo /opt/openresty/nginx/sbin/nginx  -s reload
+    sudo kill -HUP $PID
+    echo -e "\033[33m [ Nginx has reload ] \033[0m"
+else
+    echo -e "\033[31m [ Stop OK ] \033[0m"
+    sudo /opt/openresty/nginx/sbin/nginx  -t -c /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/conf/nginx.conf
+    sudo /opt/openresty/nginx/sbin/nginx  -c /mnt/hgfs/Linux-Share/Lua/lua_project_v0.01/conf/nginx.conf
+    echo -e "\033[32m [ Start OK ] \033[0m"
+fi
+exit 1

bin/stop.sh

@@ -0,0 +1,12 @@
+# server live
+server {
+    listen       80;
+    server_name  127.0.0.1;
+    charset utf8;
+    default_type text/html;
+    location / {
+          content_by_lua_block {
+                ngx.say(" Hello! lua_project_v0.01")
+            }
+    }
+}