Merge pull request #6607 from dokku/6602-unbuffered-logs
Call sed in unbuffered form to ensure log output is streamed to stdout
This commit is contained in:
2 files changed
+2
-2
No files matched your search
@@ -35,7 +35,7 @@ trigger-scheduler-docker-local-scheduler-logs() {
|
|||||||
if [[ $PRETTY_PRINT == "true" ]]; then
|
if [[ $PRETTY_PRINT == "true" ]]; then
|
||||||
local DOKKU_LOGS_CMD+="($DOCKER_BIN logs $DOKKU_LOGS_ARGS $CID 2>&1)"
|
local DOKKU_LOGS_CMD+="($DOCKER_BIN logs $DOKKU_LOGS_ARGS $CID 2>&1)"
|
||||||
else
|
else
|
||||||
local DOKKU_LOGS_PRETTY_PRINT_CMD="sed -r 's/^([^Z]+Z )/\x1b[${COLOR}m\1app[$DYNO]:\x1b[0m /gm'"
|
local DOKKU_LOGS_PRETTY_PRINT_CMD="sed -u -r 's/^([^Z]+Z )/\x1b[${COLOR}m\1app[$DYNO]:\x1b[0m /gm'"
|
||||||
local DOKKU_LOGS_CMD+="($DOCKER_BIN logs -t $DOKKU_LOGS_ARGS $CID 2>&1 | $DOKKU_LOGS_PRETTY_PRINT_CMD)"
|
local DOKKU_LOGS_CMD+="($DOCKER_BIN logs -t $DOKKU_LOGS_ARGS $CID 2>&1 | $DOKKU_LOGS_PRETTY_PRINT_CMD)"
|
||||||
fi
|
fi
|
||||||
if [[ $i != "$MAX_INDEX" ]]; then
|
if [[ $i != "$MAX_INDEX" ]]; then
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ trigger-scheduler-docker-local-scheduler-logs() {
|
|||||||
if [[ $PRETTY_PRINT == "true" ]]; then
|
if [[ $PRETTY_PRINT == "true" ]]; then
|
||||||
local DOKKU_LOGS_CMD+="($DOCKER_BIN logs $DOKKU_LOGS_ARGS $CID 2>&1)"
|
local DOKKU_LOGS_CMD+="($DOCKER_BIN logs $DOKKU_LOGS_ARGS $CID 2>&1)"
|
||||||
else
|
else
|
||||||
local DOKKU_LOGS_PRETTY_PRINT_CMD="sed -r 's/^([^Z]+Z )/\x1b[${COLOR}m\1app[$DYNO]:\x1b[0m /gm'"
|
local DOKKU_LOGS_PRETTY_PRINT_CMD="sed -u -r 's/^([^Z]+Z )/\x1b[${COLOR}m\1app[$DYNO]:\x1b[0m /gm'"
|
||||||
local DOKKU_LOGS_CMD+="($DOCKER_BIN logs -t $DOKKU_LOGS_ARGS $CID 2>&1 | $DOKKU_LOGS_PRETTY_PRINT_CMD)"
|
local DOKKU_LOGS_CMD+="($DOCKER_BIN logs -t $DOKKU_LOGS_ARGS $CID 2>&1 | $DOKKU_LOGS_PRETTY_PRINT_CMD)"
|
||||||
fi
|
fi
|
||||||
if [[ $i != "$MAX_INDEX" ]]; then
|
if [[ $i != "$MAX_INDEX" ]]; then
|
||||||
|
|||||||
Reference in new issue
Block a user