diff --git a/dokku b/dokku index 3dd1f314c9a..d335e850802 100755 --- a/dokku +++ b/dokku @@ -41,7 +41,7 @@ if [[ "${args[0]}" =~ ^--.* ]]; then fi ! has_tty && DOKKU_QUIET_OUTPUT=1 -if [[ $(id -un) != "dokku" && $1 != plugin:*install* && $1 != "plugin:update" ]]; then +if [[ $(id -un) != "dokku" && $1 != plugin:*install* && $1 != "plugin:update" && $1 != nginx:*-logs ]]; then sudo -u dokku -E -H $0 "$@" exit fi diff --git a/plugins/nginx-vhosts/commands b/plugins/nginx-vhosts/commands index be64d175151..b965951ff76 100755 --- a/plugins/nginx-vhosts/commands +++ b/plugins/nginx-vhosts/commands @@ -159,9 +159,30 @@ EOF fi fi ;; + + nginx:access-logs|nginx:error-logs) + [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1 + verify_app_name "$2" + APP="$2" + + NGINX_LOGS_TYPE=${1#nginx:} + NGINX_LOGS_TYPE=${NGINX_LOGS_TYPE%-logs} + NGINX_LOGS_PATH="/var/log/nginx/$APP-$NGINX_LOGS_TYPE.log" + + if [[ $3 == "-t" ]]; then + NGINX_LOGS_ARGS="-F" + else + NGINX_LOGS_ARGS="-n 20" + fi + + tail "$NGINX_LOGS_ARGS" "$NGINX_LOGS_PATH" + ;; + help | nginx:help) cat<, (Re)builds nginx config for given app + nginx:access-logs [-t], Show the nginx access logs for an application (-t follows) + nginx:error-logs [-t], Show the nginx error logs for an application (-t follows) EOF ;;