Merge component 'engine' from git@github.com:moby/moby 19.03

GordonTheTurtle · GordonTheTurtle · commit 235de07caa03 · 2020-10-07T01:27:58.000Z
diff --git a/components/engine/daemon/logger/gcplogs/gcplogging.go b/components/engine/daemon/logger/gcplogs/gcplogging.go
@@ -53,6 +53,7 @@ func init() {
 }
 
 type gcplogs struct {
+	client    *logging.Client
 	logger    *logging.Logger
 	instance  *instanceInfo
 	container *containerInfo
@@ -169,6 +170,7 @@ func New(info logger.Info) (logger.Logger, error) {
 	}
 
 	l := &gcplogs{
+		client: c,
 		logger: lg,
 		container: &containerInfo{
 			Name:      info.ContainerName,
@@ -236,7 +238,7 @@ func (l *gcplogs) Log(m *logger.Message) error {
 
 func (l *gcplogs) Close() error {
 	l.logger.Flush()
-	return nil
+	return l.client.Close()
 }
 
 func (l *gcplogs) Name() string {

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ func init() {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`type gcplogs struct {`
	`56`	`+ client *logging.Client`
`56`	`57`	`logger *logging.Logger`
`57`	`58`	`instance *instanceInfo`
`58`	`59`	`container *containerInfo`
`@@ -169,6 +170,7 @@ func New(info logger.Info) (logger.Logger, error) {`
`169`	`170`	`}`
`170`	`171`
`171`	`172`	`l := &gcplogs{`
	`173`	`+ client: c,`
`172`	`174`	`logger: lg,`
`173`	`175`	`container: &containerInfo{`
`174`	`176`	`Name: info.ContainerName,`
`@@ -236,7 +238,7 @@ func (l gcplogs) Log(m logger.Message) error {`
`236`	`238`
`237`	`239`	`func (l *gcplogs) Close() error {`
`238`	`240`	`l.logger.Flush()`
`239`		`- return nil`
	`241`	`+ return l.client.Close()`
`240`	`242`	`}`
`241`	`243`
`242`	`244`	`func (l *gcplogs) Name() string {`