fix: ensure log dir is created

nixpig · Feb 2, 2025 · 86a00f0 · 86a00f0
1 parent 60923a5
commit 86a00f0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/internal/cli/root.go b/internal/cli/root.go
@@ -5,6 +5,7 @@ package cli
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -21,6 +22,9 @@ func RootCmd() *cobra.Command {
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			logfile, _ := cmd.Flags().GetString("log")
 			if _, err := os.Stat(logfile); os.IsNotExist(err) {
+				if err := os.MkdirAll(filepath.Dir(logfile), os.ModeDir); err != nil {
+					fmt.Printf("Warning: failed to create log directory %s.\n", logfile)
+				}
 				f, err := os.Create(logfile)
 				if err != nil && !os.IsExist(err) {
 					fmt.Printf("Warning: failed to create log file %s.\n", logfile)

diff --git a/internal/cli/state.go b/internal/cli/state.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 
 	"github.com/nixpig/anocir/internal/operations"
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -29,7 +28,6 @@ func stateCmd() *cobra.Command {
 			if _, err := cmd.OutOrStdout().Write(
 				[]byte(state),
 			); err != nil {
-				logrus.Errorf("state operation failed: %s", err)
 				return fmt.Errorf("write state to stdout: %w", err)
 			}
 

diff --git a/internal/container/container.go b/internal/container/container.go
@@ -442,7 +442,7 @@ func (c *Container) Reexec() error {
 
 	containerConn, err := listener.Accept()
 	if err != nil {
-		logrus.Errorf("☠️ accept on container socket: %s", err)
+		logrus.Errorf("failed to accept on container socket: %s", err)
 		return fmt.Errorf("accept on container sock: %w", err)
 	}