瀏覽代碼

Merge pull request #1630 from ndeloof/logs_panic

don't invoke r.Close on error as r == nil
Nicolas De loof 4 年之前
父節點
當前提交
2c79e63b83
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      local/compose/logs.go

+ 2 - 2
local/compose/logs.go

@@ -51,11 +51,11 @@ func (s *composeService) Logs(ctx context.Context, projectName string, consumer
 				Tail:       options.Tail,
 				Timestamps: options.Timestamps,
 			})
-			defer r.Close() // nolint errcheck
-
 			if err != nil {
 				return err
 			}
+			defer r.Close() // nolint errcheck
+
 			name := getContainerNameWithoutProject(c)
 			w := utils.GetWriter(name, service, func(event compose.ContainerEvent) {
 				consumer.Log(name, service, event.Line)