cmd/pew.go

@@ -12,7 +12,6 @@ import (
 	"math/rand"
 	"os"
 	"os/exec"
-	"path/filepath"
 	"strings"
 	"time"
 
@@ -91,8 +90,6 @@ type PewCmd struct {
 	OutputOnSuccess bool `help:"show output on success"`
 	RealtimeOutput  bool `help:"show realtime output"`
 
-	LogDir string `help:"write logs to directory"`
-
 	Endless        bool          `help:"endless tests"`
 	EndlessTimeout time.Duration `help:"timeout between tests" default:"1m"`
 	EndlessStress  string        `help:"endless stress script" type:"existingfile"`
@@ -406,54 +403,39 @@ func (cmd PewCmd) testArtifact(swg *sizedwaitgroup.SizedWaitGroup,
 
 	defer swg.Done()
 
-	var logDirWriter *zerolog.ConsoleWriter
+	logdir := "logs/" + cmd.Tag
-	if cmd.LogDir != "" {
+	err := os.MkdirAll(logdir, os.ModePerm)
-		logdir := filepath.Join(cmd.LogDir, cmd.Tag)
+	if err != nil {
-		err := os.MkdirAll(logdir, os.ModePerm)
+		log.Error().Err(err).Msgf("mkdir %s", logdir)
-		if err != nil {
+		return
-			log.Error().Err(err).Msgf("mkdir %s", logdir)
+	}
-			return
-		}
 
-		logfile := fmt.Sprintf("logs/%s/%s-%s-%s.log",
+	logfile := fmt.Sprintf("logs/%s/%s-%s-%s.log",
-			cmd.Tag,
+		cmd.Tag,
-			ki.Distro.ID.String(),
+		ki.Distro.ID.String(),
-			ki.Distro.Release,
+		ki.Distro.Release,
-			ki.KernelRelease,
+		ki.KernelRelease,
-		)
+	)
-		f, err := os.Create(logfile)
+	f, err := os.Create(logfile)
-		if err != nil {
+	if err != nil {
-			log.Error().Err(err).Msgf("create %s", logfile)
+		log.Error().Err(err).Msgf("create %s", logfile)
-			return
+		return
-		}
+	}
-		defer f.Close()
+	defer f.Close()
 
-		logDirWriter = &zerolog.ConsoleWriter{
+	slog := zerolog.New(zerolog.MultiLevelWriter(
+		&ConsoleWriter,
+		&FileWriter,
+		&zerolog.ConsoleWriter{
 			Out: f,
 			FieldsExclude: []string{
 				"distro_release",
 				"distro_type",
 				"kernel",
-				"command",
-				"workdir",
 			},
 			NoColor: true,
-		}
+		},
-	}
+	))
-
-	var slog zerolog.Logger
-	if logDirWriter != nil {
-		slog = zerolog.New(zerolog.MultiLevelWriter(
-			&ConsoleWriter,
-			&FileWriter,
-			logDirWriter,
-		))
-	} else {
-		slog = zerolog.New(zerolog.MultiLevelWriter(
-			&ConsoleWriter,
-			&FileWriter,
-		))
-	}
 
 	switch LogLevel {
 	case zerolog.TraceLevel, zerolog.DebugLevel:

container/container.go

@@ -466,7 +466,7 @@ func (c Container) build(imagePath string) (output string, err error) {
 	return
 }
 
-func (c *Container) Run(workdir string, cmds []string) (out string, err error) {
+func (c Container) Run(workdir string, cmds []string) (out string, err error) {
 	flog := c.Log.With().
 		Str("workdir", workdir).
 		Str("command", fmt.Sprintf("%v", cmds)).
@@ -535,7 +535,7 @@ func (c *Container) Run(workdir string, cmds []string) (out string, err error) {
 			}
 			c.handleCommandsOutput(m)
 			out += m + "\n"
-			flog.Trace().Str("container stdout", m).Msg("")
+			flog.Trace().Str("stdout", m).Msg("")
 		}
 	}()