Skip to content

Commit 6be8bc0

Browse files
authored
fix: 解决容器编排创建日志加载慢的问题 (#1973)
Refs #1950
1 parent 8433822 commit 6be8bc0

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

backend/app/service/container.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,9 +631,9 @@ func (u *ContainerService) ContainerStats(id string) (*dto.ContainerStats, error
631631
func (u *ContainerService) LoadContainerLogs(req dto.OperationWithNameAndType) string {
632632
filePath := ""
633633
switch req.Type {
634-
case "image-pull", "image-push", "image-build":
634+
case "image-pull", "image-push", "image-build", "compose-create":
635635
filePath = path.Join(global.CONF.System.TmpDir, fmt.Sprintf("docker_logs/%s", req.Name))
636-
case "compose-detail", "compose-create":
636+
case "compose-detail":
637637
client, err := docker.NewDockerClient()
638638
if err != nil {
639639
return ""

backend/app/service/container_compose.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,10 @@ func (u *ContainerService) CreateCompose(req dto.ComposeCreate) (string, error)
159159
if req.From == "path" {
160160
req.Name = path.Base(path.Dir(req.Path))
161161
}
162-
logName := path.Dir(req.Path) + "/compose.log"
163-
file, err := os.OpenFile(logName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
162+
163+
dockerLogDir := path.Join(global.CONF.System.TmpDir, "docker_logs")
164+
logItem := fmt.Sprintf("%s/compose_create_%s_%s.log", dockerLogDir, req.Name, time.Now().Format("20060102150405"))
165+
file, err := os.OpenFile(logItem, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
164166
if err != nil {
165167
return "", err
166168
}
@@ -181,7 +183,7 @@ func (u *ContainerService) CreateCompose(req dto.ComposeCreate) (string, error)
181183
_, _ = file.WriteString("docker-compose up successful!")
182184
}()
183185

184-
return req.Name, nil
186+
return path.Base(logItem), nil
185187
}
186188

187189
func (u *ContainerService) ComposeOperation(req dto.ComposeOperation) error {

0 commit comments

Comments
 (0)