feat：调整构建脚本，删除nginx代码 (#13)

* feat：调整构建脚本，删除nginx代码

* 使用rm -f防止删除失败

* feat; 无需执行清理逻辑

* feat: 修改nginx限流的问题

Author: andrewshan

.github/workflows/testing.yml

@@ -13,13 +13,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: clean
-      run: |
-       pushd build
-       ./clean.sh
-       popd
     - name: make
       run: |
         pushd build
-        ./make.sh
+        bash make.sh
         popd

build/build.sh

@@ -10,6 +10,11 @@ echo "build nginx-gateway for version ${version}"
 pushd ../third_party
 rm -rf polaris-cpp
 git clone -b release_v1.1.0 https://github.com/polarismesh/polaris-cpp polaris-cpp
+rm -rf nginx-1.18.0
+curl http://nginx.org/download/nginx-1.18.0.tar.gz -o nginx-1.18.0.tar.gz
+tar xf nginx-1.18.0.tar.gz
+cp nginx/make nginx-1.18.0/auto/
+
 
 pushd polaris-cpp
 make

build/clean.sh

@@ -5,6 +5,9 @@ set -e
 pushd ../third_party
 rm -rf polaris-cpp
 git clone -b release_v1.1.0 https://github.com/polarismesh/polaris-cpp polaris-cpp
+rm -rf nginx-1.18.0
+curl http://nginx.org/download/nginx-1.18.0.tar.gz -o nginx-1.18.0.tar.gz
+tar xf nginx-1.18.0.tar.gz
 
 pushd polaris-cpp
 make

build/make.sh

@@ -8,3 +8,11 @@ global:
     #类型:list
     addresses:
       - ${polaris_address} # 埋点地址
+# 描述：限流相关配置
+rateLimiter:
+  # 分布式限流时用于发现限流服务器
+  rateLimitCluster:
+    # 限流服务器集群所在命名空间
+    namespace: Polaris
+    # 限流服务器集群名字
+    service: polaris.limiter

polaris.yaml

@@ -107,15 +107,16 @@ static ngx_int_t ngx_http_polaris_limit_handler(ngx_http_request_t *r) {
     }
 
     get_labels_from_request(r, label_keys, labels);    // 从http 请求中获取labels
-
+    std::string uri(reinterpret_cast<char *>(r->uri.data), r->uri.len);
     quota_request.SetServiceNamespace(service_namespace);       // 设置限流规则对应服务的命名空间
     quota_request.SetServiceName(service_name);                 // 设置限流规则对应的服务名
+    quota_request.SetMethod(uri);
     quota_request.SetLabels(labels);                            // 设置label用于匹配限流规则
 
     std::string labels_values_str;
     join_map_str(r->connection->log, labels, labels_values_str);
     ngx_log_debug(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 
-        "[PolarisRateLimiting] quota_request namespace %s, service %s, labels %s", service_namespace.c_str(), service_name.c_str(), labels_values_str.c_str());
+        "[PolarisRateLimiting] quota_request namespace %s, service %s, method %s, labels %s", service_namespace.c_str(), service_name.c_str(), uri.c_str(), labels_values_str.c_str());
 
     ret = Limit_API_SINGLETON.GetLimitApi()->GetQuota(quota_request, result);
 
@@ -173,7 +174,7 @@ static char *ngx_http_polaris_limit_conf_set(ngx_conf_t *cf, ngx_command_t *cmd,
             } else {
                 ngx_str_t namespace_str = {value[i].len - KEY_NAMESPACE_SIZE, &value[i].data[KEY_NAMESPACE_SIZE]};
                 plcf->service_namespace = namespace_str;
-                ngx_conf_log_error(NGX_LOG_NOTICE, cf, 0, "[PolarisRateLimiting] use %v as nginx namespace", namespace_str);
+                ngx_conf_log_error(NGX_LOG_NOTICE, cf, 0, "[PolarisRateLimiting] use %V as nginx namespace", &namespace_str);
             }
             continue;
         }
@@ -187,7 +188,7 @@ static char *ngx_http_polaris_limit_conf_set(ngx_conf_t *cf, ngx_command_t *cmd,
                 ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "[PolarisRateLimiting] service name not set");
                 return static_cast<char *>(NGX_CONF_ERROR);
             } else {
-                ngx_conf_log_error(NGX_LOG_NOTICE, cf, 0, "[PolarisRateLimiting] use %v as service", svc_name_str);
+                ngx_conf_log_error(NGX_LOG_NOTICE, cf, 0, "[PolarisRateLimiting] use %V as service", &svc_name_str);
             }
             continue;
         }