feat: refactor to retrieve listeners from network plugin

This commit is contained in:
Jose Diaz-Gonzalez authored and Michael Hobbs committed 2017-10-02 15:05:13 -07:00
1 parent a9e0f8b7be
commit d7d5d373c9
3 files changed
+21 -7

No files matched your search

+15
View File
@@ -94,6 +94,21 @@ network-get-container-ipaddr() {
echo "$IP_ADDRESS" echo "$IP_ADDRESS"
} }
network-get-container-listeners() {
declare desc="Return the listeners (host:port combinations) for a given app container"
declare APP="$1"
local IP_FILE LISTENER_IP LISTENER_PORT LISTENERS PORT_FILE
for IP_FILE in $DOKKU_ROOT/$APP/IP.web.*; do
local PORT_FILE="${IP_FILE//IP/PORT}"
local LISTENER_IP=$(< "$IP_FILE")
local LISTENER_PORT=$(< "$PORT_FILE")
local LISTENERS+="$LISTENER_IP:$LISTENER_PORT "
done
echo "$LISTENERS"
}
network-get-container-port() { network-get-container-port() {
declare desc="Return the port for a given app container" declare desc="Return the port for a given app container"
declare APP="$1" PROC_TYPE="$2" CID="$3" declare APP="$1" PROC_TYPE="$2" CID="$3"
+5
View File
@@ -0,0 +1,5 @@
#!/usr/bin/env bash
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$PLUGIN_AVAILABLE_PATH/network/functions"
network-get-container-listeners "$@"
+1 -7
View File
@@ -229,13 +229,7 @@ nginx_build_config() {
if [[ -z "$DOKKU_DISABLE_PROXY" ]]; then if [[ -z "$DOKKU_DISABLE_PROXY" ]]; then
if [[ -z "$DOKKU_APP_LISTEN_PORT" ]] && [[ -z "$DOKKU_APP_LISTEN_IP" ]]; then if [[ -z "$DOKKU_APP_LISTEN_PORT" ]] && [[ -z "$DOKKU_APP_LISTEN_IP" ]]; then
shopt -s nullglob shopt -s nullglob
local DOKKU_APP_IP_FILE local DOKKU_APP_LISTENERS="$(plugn trigger network-get-listeners "$APP")"
for DOKKU_APP_IP_FILE in $DOKKU_ROOT/$APP/IP.web.*; do
local DOKKU_APP_PORT_FILE="${DOKKU_APP_IP_FILE//IP/PORT}"
local DOKKU_APP_LISTENER_IP=$(< "$DOKKU_APP_IP_FILE")
local DOKKU_APP_LISTENER_PORT=$(< "$DOKKU_APP_PORT_FILE")
local DOKKU_APP_LISTENERS+="$DOKKU_APP_LISTENER_IP:$DOKKU_APP_LISTENER_PORT "
done
local DOKKU_APP_LISTENERS="$(echo "$DOKKU_APP_LISTENERS" | xargs)" local DOKKU_APP_LISTENERS="$(echo "$DOKKU_APP_LISTENERS" | xargs)"
shopt -u nullglob shopt -u nullglob
elif [[ -n "$DOKKU_APP_LISTEN_PORT" ]] && [[ -n "$DOKKU_APP_LISTEN_IP" ]]; then elif [[ -n "$DOKKU_APP_LISTEN_PORT" ]] && [[ -n "$DOKKU_APP_LISTEN_IP" ]]; then