Browse code

Use common logging in engine

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>

Alexandr Morozov authored on 2014/10/25 03:20:17
Showing 1 changed files
... ...
@@ -6,6 +6,8 @@ import (
6 6
 	"io"
7 7
 	"strings"
8 8
 	"time"
9
+
10
+	log "github.com/Sirupsen/logrus"
9 11
 )
10 12
 
11 13
 // A job is the fundamental unit of work in the docker engine.
... ...
@@ -66,10 +68,12 @@ func (job *Job) Run() error {
66 66
 		return fmt.Errorf("%s: job has already completed", job.Name)
67 67
 	}
68 68
 	// Log beginning and end of the job
69
-	job.Eng.Logf("+job %s", job.CallString())
70
-	defer func() {
71
-		job.Eng.Logf("-job %s%s", job.CallString(), job.StatusString())
72
-	}()
69
+	if job.Eng.Logging {
70
+		log.Infof("+job %s", job.CallString())
71
+		defer func() {
72
+			log.Infof("-job %s%s", job.CallString(), job.StatusString())
73
+		}()
74
+	}
73 75
 	var errorMessage = bytes.NewBuffer(nil)
74 76
 	job.Stderr.Add(errorMessage)
75 77
 	if job.handler == nil {