Merge pull request #57 from asalkeld/unique-log-file

Make the run log file unique
nitrictech · Feb 3, 2022 · 4408494 · 4408494
2 parents 726004d + 81808b9
commit 4408494
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/pkg/containerengine/docker.go b/pkg/containerengine/docker.go
@@ -24,7 +24,6 @@ import (
 	"io"
 	"log"
 	"os/exec"
-	"path"
 	"strings"
 	"time"
 
@@ -291,6 +290,7 @@ func (d *docker) Logger(stackPath string) ContainerLogger {
 	if d.logger != nil {
 		return d.logger
 	}
-	d.logger = newSyslog(path.Join(utils.NitricLogDir(stackPath), "run.log"))
+	logPath, _ := utils.NewNitricLogFile(stackPath)
+	d.logger = newSyslog(logPath)
 	return d.logger
 }
diff --git a/pkg/containerengine/podman.go b/pkg/containerengine/podman.go
@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"io"
 	"os/exec"
-	"path"
 	"strings"
 	"time"
 
@@ -131,7 +130,8 @@ func (p *podman) ContainerExec(containerName string, cmd []string, workingDir st
 }
 
 func (p *podman) Logger(stackPath string) ContainerLogger {
-	return &jsonfile{logPath: path.Join(utils.NitricLogDir(stackPath), "run.log")}
+	logPath, _ := utils.NewNitricLogFile(stackPath)
+	return &jsonfile{logPath: logPath}
 }
 
 type jsonfile struct {

diff --git a/pkg/run/minio.go b/pkg/run/minio.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"time"
 
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/mount"
@@ -126,7 +127,8 @@ func (m *MinioServer) GetApiPort() int {
 }
 
 func (m *MinioServer) Stop() error {
-	return m.ce.Stop(m.cid, nil)
+	timeout := time.Second * 5
+	return m.ce.Stop(m.cid, &timeout)
 }
 
 func NewMinio(dir string, name string) (*MinioServer, error) {

diff --git a/pkg/utils/paths.go b/pkg/utils/paths.go
@@ -86,3 +86,13 @@ func NitricConfigDir() string {
 func NitricLogDir(stackPath string) string {
 	return path.Join(stackPath, ".nitric")
 }
+
+// NewNitricLogFile returns a path to a unique log file that does not exist.
+func NewNitricLogFile(stackPath string) (string, error) {
+	tf, err := os.CreateTemp(NitricLogDir(stackPath), "run-*.log")
+	if err != nil {
+		return "", err
+	}
+	tf.Close()
+	return tf.Name(), nil
+}