From d9f451648d5e7f7b0a5e4e84d2b7ec3a80c0dc7e Mon Sep 17 00:00:00 2001 From: Gary Forghetti <5776430+gforghetti@users.noreply.github.com> Date: Wed, 30 May 2018 22:10:18 -0400 Subject: [PATCH 1/5] Comment out Partial --- driver.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/driver.go b/driver.go index 8552e51..7b2692b 100644 --- a/driver.go +++ b/driver.go @@ -103,7 +103,7 @@ func consumeLog(lf *logPair) { var msg logger.Message msg.Line = buf.Line msg.Source = buf.Source - msg.Partial = buf.Partial + // msg.Partial = buf.Partial msg.Timestamp = time.Unix(0, buf.TimeNano) if err := lf.l.Log(&msg); err != nil { @@ -146,7 +146,7 @@ func (d *driver) ReadLogs(info logger.Info, config logger.ReadConfig) (io.ReadCl } buf.Line = msg.Line - buf.Partial = msg.Partial + // buf.Partial = msg.Partial buf.TimeNano = msg.Timestamp.UnixNano() buf.Source = msg.Source From 0b6b6c7ab1cedfddcf7fcbbe70abadfcaf95b061 Mon Sep 17 00:00:00 2001 From: Gary Forghetti <5776430+gforghetti@users.noreply.github.com> Date: Tue, 12 Feb 2019 08:22:27 -0500 Subject: [PATCH 2/5] Update golang version in Dockerfile.build --- Dockerfile.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.build b/Dockerfile.build index 6193935..3d0362f 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,4 +1,4 @@ -FROM golang:1.7 +FROM golang:1.11.5 -COPY . /go/src/github.com/cpuguy83/docker-log-driver -RUN cd /go/src/github.com/cpuguy83/docker-log-driver && go get && go build --ldflags '-extldflags "-static"' -o /usr/bin/docker-log-driver +COPY . /go/src/github.com/gforghetti/docker-log-driver +RUN cd /go/src/github.com/gforghetti/docker-log-driver && go get && go build --ldflags '-extldflags "-static"' -o /usr/bin/docker-log-driver From 1593836fc595916f7dbd38e3ede935102c8ce0d1 Mon Sep 17 00:00:00 2001 From: Gary Forghetti <5776430+gforghetti@users.noreply.github.com> Date: Tue, 12 Feb 2019 13:40:02 -0500 Subject: [PATCH 3/5] Change watcher.Close() to watcher.ConsumerGone() due to a change in the LogWatcher module --- driver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/driver.go b/driver.go index 7b2692b..6c08647 100644 --- a/driver.go +++ b/driver.go @@ -134,7 +134,7 @@ func (d *driver) ReadLogs(info logger.Info, config logger.ReadConfig) (io.ReadCl enc := protoio.NewUint32DelimitedWriter(w, binary.BigEndian) defer enc.Close() - defer watcher.Close() + defer watcher.ConsumerGone() var buf logdriver.LogEntry for { From 099cb69ac0c97cfed9b22dd0174763b6c90097a1 Mon Sep 17 00:00:00 2001 From: Gary Forghetti <5776430+gforghetti@users.noreply.github.com> Date: Tue, 12 Feb 2019 14:14:19 -0500 Subject: [PATCH 4/5] Dockerfile change --- Dockerfile.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.build b/Dockerfile.build index 3d0362f..13f3c29 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,4 +1,4 @@ FROM golang:1.11.5 -COPY . /go/src/github.com/gforghetti/docker-log-driver -RUN cd /go/src/github.com/gforghetti/docker-log-driver && go get && go build --ldflags '-extldflags "-static"' -o /usr/bin/docker-log-driver +COPY . /go/src/github.com/cpuguy83/docker-log-driver +RUN cd /go/src/github.com/cpuguy83/docker-log-driver && go get && go build --ldflags '-extldflags "-static"' -o /usr/bin/docker-log-driver \ No newline at end of file From 5f1e5a249343427a38bfe5dc2fd9d3647f1c86d8 Mon Sep 17 00:00:00 2001 From: Gary Forghetti <5776430+gforghetti@users.noreply.github.com> Date: Tue, 12 Feb 2019 15:40:54 -0500 Subject: [PATCH 5/5] Fix Partial Log support --- driver.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/driver.go b/driver.go index 6c08647..dc9c3ff 100644 --- a/driver.go +++ b/driver.go @@ -103,7 +103,11 @@ func consumeLog(lf *logPair) { var msg logger.Message msg.Line = buf.Line msg.Source = buf.Source - // msg.Partial = buf.Partial + if buf.PartialLogMetadata != nil { + msg.PLogMetaData.ID = buf.PartialLogMetadata.Id + msg.PLogMetaData.Last = buf.PartialLogMetadata.Last + msg.PLogMetaData.Ordinal = int(buf.PartialLogMetadata.Ordinal) + } msg.Timestamp = time.Unix(0, buf.TimeNano) if err := lf.l.Log(&msg); err != nil { @@ -146,7 +150,7 @@ func (d *driver) ReadLogs(info logger.Info, config logger.ReadConfig) (io.ReadCl } buf.Line = msg.Line - // buf.Partial = msg.Partial + buf.Partial = msg.PLogMetaData != nil buf.TimeNano = msg.Timestamp.UnixNano() buf.Source = msg.Source