X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d77bf0c67422a259afacc17660698729328a1ed3..a95f899d7ac84f29b3d019aa410d265bb40833e5:/services/crunch-run/logging.go

diff --git a/services/crunch-run/logging.go b/services/crunch-run/logging.go
index 9d97384109..20928dbef7 100644
--- a/services/crunch-run/logging.go
+++ b/services/crunch-run/logging.go
@@ -35,6 +35,7 @@ type ThrottledLogger struct {
 	stop        bool
 	flusherDone chan bool
 	Timestamper
+	Immediate *log.Logger
 }
 
 // RFC3339Fixed is a fixed-width version of RFC3339 with microsecond precision,
@@ -59,6 +60,9 @@ func (tl *ThrottledLogger) Write(p []byte) (n int, err error) {
 	sc := bufio.NewScanner(bytes.NewBuffer(p))
 	for sc.Scan() {
 		_, err = fmt.Fprintf(tl.buf, "%s %s\n", now, sc.Text())
+		if tl.Immediate != nil {
+			tl.Immediate.Printf("%s %s\n", now, sc.Text())
+		}
 	}
 	return len(p), err
 }
@@ -180,9 +184,10 @@ func (arvlog *ArvLogWriter) Write(p []byte) (n int, err error) {
 	}
 
 	// write to API
-	lr := arvadosclient.Dict{"object_uuid": arvlog.UUID,
-		"event_type": arvlog.loggingStream,
-		"properties": map[string]string{"text": string(p)}}
+	lr := arvadosclient.Dict{"log": arvadosclient.Dict{
+		"object_uuid": arvlog.UUID,
+		"event_type":  arvlog.loggingStream,
+		"properties":  map[string]string{"text": string(p)}}}
 	err2 := arvlog.ArvClient.Create("logs", lr, nil)
 
 	if err1 != nil || err2 != nil {