fix panic in docker driver for newer docker version (18.09.7+) (#813)

grafana · Jul 29, 2019 · b946343 · b946343
1 parent 573673a
commit b946343
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/cmd/docker-driver/driver.go b/cmd/docker-driver/driver.go
@@ -12,6 +12,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/docker/docker/api/types/backend"
 	"github.com/docker/docker/api/types/plugins/logdriver"
 	"github.com/docker/docker/daemon/logger"
 	"github.com/docker/docker/daemon/logger/jsonfilelog"
@@ -124,6 +125,9 @@ func consumeLog(lf *logPair) {
 		msg.Line = buf.Line
 		msg.Source = buf.Source
 		if buf.PartialLogMetadata != nil {
+			if msg.PLogMetaData == nil {
+				msg.PLogMetaData = &backend.PartialLogMetaData{}
+			}
 			msg.PLogMetaData.ID = buf.PartialLogMetadata.Id
 			msg.PLogMetaData.Last = buf.PartialLogMetadata.Last
 			msg.PLogMetaData.Ordinal = int(buf.PartialLogMetadata.Ordinal)