Log archiving: merge stderr with stdout

See plushu/plushu-app-docker-logs#1
plushu · May 23, 2015 · 950bedc · 950bedc
1 parent 848744c
commit 950bedc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hooks/start-local-app/50_start-new-container b/hooks/start-local-app/50_start-new-container
@@ -21,7 +21,7 @@ if [[ -f "$app_dir/release.iid" && ! -f "$cidfile" ]]; then
 
     # stop the container and allow plugin(s) to archive its logs
     docker stop "$(<"$app_dir/old-web.cid")" > /dev/null
-    docker logs -t "$(<"$app_dir/old-web.cid")" |
+    docker logs -t "$(<"$app_dir/old-web.cid")" 2>&1 |
       "$PLUSHU_ROOT/lib/plushook" -i archive-app-proc-log "$app" "web" ||:
 
     # remove the old container

diff --git a/hooks/stop-local-app/50_stop-container b/hooks/stop-local-app/50_stop-container
@@ -11,7 +11,7 @@ if [[ -f "$cidfile" ]]; then
 
     # stop the container and allow plugin(s) to archive its logs
     docker stop "$(<"$cidfile")" > /dev/null
-    docker logs -t "$(<"$cidfile")" | "$PLUSHU_ROOT/lib/plushook" -i \
+    docker logs -t "$(<"$cidfile")" 2>&1 | "$PLUSHU_ROOT/lib/plushook" -i \
       archive-app-proc-log "$app" "$proc_name" ||:
 
     # remove the old container