Attachment 830533 Details for Bug 1036027 – Patch that fixes this issue

[patch] Patch that fixes this issue

0001-Redirect-docker-log-to-var-log-docker.patch (text/plain), 1.56 KB, created by Marek Goldmann on 2013-11-29 08:44:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Goldmann

Created: 2013-11-29 08:44:37 UTC

Size: 1.56 KB

patch

obsolete

>From c16a796371292618883953464ea8a9bd371e0f12 Mon Sep 17 00:00:00 2001
>From: Marek Goldmann <marek.goldmann@gmail.com>
>Date: Fri, 29 Nov 2013 09:41:52 +0100
>Subject: [PATCH] Redirect docker log to /var/log/docker
>
>---
> docker-io.spec  | 5 ++++-
> docker.sysvinit | 4 +++-
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/docker-io.spec b/docker-io.spec
>index 4cb0222..8657dde 100644
>--- a/docker-io.spec
>+++ b/docker-io.spec
>@@ -14,7 +14,7 @@
> 
> Name:           docker-io
> Version:        0.7.0
>-Release:        10%{?dist}
>+Release:        11%{?dist}
> Summary:        Automates deployment of containerized applications
> License:        ASL 2.0
> 
>@@ -174,6 +174,9 @@ fi
> %endif
> 
> %changelog
>+* Fri Nov 29 2013 Marek Goldmann <mgoldman@redhat.com> - 0.7.0-11
>+- Redirect docker log to /var/log/docker
>+
> * Thu Nov 28 2013 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.0-10
> - udev rules added for fedora >= 19 BZ 1034095
> - epel testing pending
>diff --git a/docker.sysvinit b/docker.sysvinit
>index d3c29a8..a9feaad 100644
>--- a/docker.sysvinit
>+++ b/docker.sysvinit
>@@ -26,6 +26,7 @@ exec="/usr/bin/docker"
> prog="docker"
> pidfile="/var/run/$prog.pid"
> lockfile="/var/lock/subsys/$prog"
>+logfile="/var/log/$prog"
> 
> [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
> 
>@@ -44,7 +45,8 @@ start() {
>     if ! [ -f $pidfile ]; then
>         prestart
>         printf "Starting $prog:\t"
>-        $exec -d $other_args 1>/dev/null 2>&1 &
>+        echo "\n$(date)\n" >> $logfile
>+        $exec -d $other_args &>> $logfile &
>         pid=$!
>         touch $lockfile
>         success
>-- 
>1.8.4.2
>

Actions: View | Diff

Attachments on bug 1036027: 830533