فهرست منبع

Merge pull request #9837 from zmstone/0123-fix-resource-worker-leak-influxdb

0123 fix resource worker leak influxdb
Zaiming (Stone) Shi 3 سال پیش
والد
کامیت
bafc430184
2فایلهای تغییر یافته به همراه5 افزوده شده و 1 حذف شده
  1. 3 1
      build
  2. 2 0
      lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl

+ 3 - 1
build

@@ -332,13 +332,15 @@ make_docker() {
     if [[ "$PROFILE" = *-elixir ]]; then
       PKG_VSN="$PKG_VSN-elixir"
     fi
+    local default_tag="emqx/${PROFILE%%-elixir}:${PKG_VSN}"
+    EMQX_IMAGE_TAG="${EMQX_IMAGE_TAG:-$default_tag}"
 
     set -x
     docker build --no-cache --pull \
        --build-arg BUILD_FROM="${EMQX_BUILDER}" \
        --build-arg RUN_FROM="${EMQX_RUNNER}" \
        --build-arg EMQX_NAME="$PROFILE" \
-       --tag "emqx/${PROFILE%%-elixir}:${PKG_VSN}" \
+       --tag "${EMQX_IMAGE_TAG}" \
        -f "${EMQX_DOCKERFILE}" .
 }
 

+ 2 - 0
lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl

@@ -248,6 +248,8 @@ do_start_client(
                         client => Client,
                         reason => "client is not alive"
                     }),
+                    %% no leak
+                    _ = influxdb:stop_client(Client),
                     {error, influxdb_client_not_alive}
             end;
         {error, {already_started, Client0}} ->