Skip to content

Commit

Permalink
Merge pull request #5 from gforghetti/master
Browse files Browse the repository at this point in the history
LogWatcher Module change required watcher.Close() to be changed to watcher.ConsumerGone()
  • Loading branch information
cpuguy83 committed Feb 28, 2019
2 parents fd20aaa + 5f1e5a2 commit d53b76e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.build
Original file line number Diff line number Diff line change
@@ -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
RUN cd /go/src/github.com/cpuguy83/docker-log-driver && go get && go build --ldflags '-extldflags "-static"' -o /usr/bin/docker-log-driver
10 changes: 7 additions & 3 deletions driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -134,7 +138,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 {
Expand All @@ -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

Expand Down

0 comments on commit d53b76e

Please sign in to comment.