From 901ec7c21395deeaee0b0493a54acf9b6971e265 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 21 Apr 2017 02:49:39 -0600 Subject: [PATCH] refactor: retrieve ip and port for checks from the network plugin triggers --- plugins/checks/subcommands/run | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/checks/subcommands/run b/plugins/checks/subcommands/run index 9f9b9f2f9..a97758043 100755 --- a/plugins/checks/subcommands/run +++ b/plugins/checks/subcommands/run @@ -46,8 +46,6 @@ check_process_type() { check_process() { local APP="$1" PROC_TYPE="$2" CONTAINER_INDEX="$3" local DOKKU_CONTAINER_ID_FILE="$DOKKU_ROOT/$APP/CONTAINER.$PROC_TYPE.$CONTAINER_INDEX" - local DOKKU_IP_FILE="$DOKKU_ROOT/$APP/IP.$PROC_TYPE.$CONTAINER_INDEX" - local DOKKU_PORT_FILE="$DOKKU_ROOT/$APP/PORT.$PROC_TYPE.$CONTAINER_INDEX" if [[ ! -f "$DOKKU_CONTAINER_ID_FILE" ]]; then dokku_log_fail "Invalid container index specified ($APP.$PROC_TYPE.$CONTAINER_INDEX)" @@ -55,8 +53,8 @@ check_process() { dokku_log_info1 "Running checks for app ($APP.$PROC_TYPE.$CONTAINER_INDEX)" local CONTAINER_ID=$(< "$DOKKU_CONTAINER_ID_FILE") - local IP=$(< "$DOKKU_IP_FILE") - local PORT=$(< "$DOKKU_PORT_FILE") + local IP="$(plugn trigger network-get-ipaddr "$APP" "PROC_TYPE" "$CONTAINER_ID")" + local PORT="$(plugn trigger network-get-port "$APP" "PROC_TYPE" "$CONTAINER_ID")" plugn trigger check-deploy "$APP" "$CONTAINER_ID" "$PROC_TYPE" "$PORT" "$IP" }