diff options
| author | Brian Goff <cpuguy83@gmail.com> | 2020-10-06 14:27:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-06 14:27:10 -0700 |
| commit | 233a6379e5c07588d8eb3be3b7a57dc916336b0b (patch) | |
| tree | f8e111b11f3ef96596baa8baf6106310dad90bc9 | |
| parent | 88623e101cbcbacce553b40ed0a5734171227151 (diff) | |
| parent | 74c0c5b7f1a90bead853e98c7f77936caffba8d2 (diff) | |
| download | docker-233a6379e5c07588d8eb3be3b7a57dc916336b0b.tar.gz | |
Merge pull request #41522 from thaJeztah/19.03_backport_gcp_leak
[19.03 backport] Fix gcplogs memory/connection leak
| -rw-r--r-- | daemon/logger/gcplogs/gcplogging.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/daemon/logger/gcplogs/gcplogging.go b/daemon/logger/gcplogs/gcplogging.go index 1699f67a2d..90d5f7b162 100644 --- a/daemon/logger/gcplogs/gcplogging.go +++ b/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 { |