refactor: retrieve ip and port for checks from the network plugin triggers
This commit is contained in:
1 parent
6fbd148597
commit
901ec7c213
1 file changed
+2
-4
@@ -46,8 +46,6 @@ check_process_type() {
|
|||||||
check_process() {
|
check_process() {
|
||||||
local APP="$1" PROC_TYPE="$2" CONTAINER_INDEX="$3"
|
local APP="$1" PROC_TYPE="$2" CONTAINER_INDEX="$3"
|
||||||
local DOKKU_CONTAINER_ID_FILE="$DOKKU_ROOT/$APP/CONTAINER.$PROC_TYPE.$CONTAINER_INDEX"
|
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
|
if [[ ! -f "$DOKKU_CONTAINER_ID_FILE" ]]; then
|
||||||
dokku_log_fail "Invalid container index specified ($APP.$PROC_TYPE.$CONTAINER_INDEX)"
|
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)"
|
dokku_log_info1 "Running checks for app ($APP.$PROC_TYPE.$CONTAINER_INDEX)"
|
||||||
local CONTAINER_ID=$(< "$DOKKU_CONTAINER_ID_FILE")
|
local CONTAINER_ID=$(< "$DOKKU_CONTAINER_ID_FILE")
|
||||||
local IP=$(< "$DOKKU_IP_FILE")
|
local IP="$(plugn trigger network-get-ipaddr "$APP" "PROC_TYPE" "$CONTAINER_ID")"
|
||||||
local PORT=$(< "$DOKKU_PORT_FILE")
|
local PORT="$(plugn trigger network-get-port "$APP" "PROC_TYPE" "$CONTAINER_ID")"
|
||||||
plugn trigger check-deploy "$APP" "$CONTAINER_ID" "$PROC_TYPE" "$PORT" "$IP"
|
plugn trigger check-deploy "$APP" "$CONTAINER_ID" "$PROC_TYPE" "$PORT" "$IP"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user