Allow configuring log directory separately from config directory (#8)

* feat: Add XDG-compliant log dir Signed-off-by: Felicitas Pojtinger <[email protected]> * fix: Correct casing and use Viper conventions for flag default formatting Signed-off-by: Felicitas Pojtinger <[email protected]> --------- Signed-off-by: Felicitas Pojtinger <[email protected]>
loopholelabs · Jul 25, 2024 · dde74cb · dde74cb
1 parent 5e2ba7b
commit dde74cb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pkg/command/command.go b/pkg/command/command.go
@@ -118,11 +118,16 @@ func (c *Command[T]) runCmd(ctx context.Context, format *printer.Format, debug *
 		return err
 	}
 
+	logDir, err := c.config.DefaultLogDir()
+	if err != nil {
+		return err
+	}
+
 	configPath := path.Join(configDir, c.config.DefaultConfigFile())
-	logPath := path.Join(configDir, c.config.DefaultLogFile())
+	logPath := path.Join(logDir, c.config.DefaultLogFile())
 
-	c.command.PersistentFlags().StringVar(&cfgFile, "config", "", fmt.Sprintf("Config file (default is %s)", configPath))
-	c.command.PersistentFlags().StringVar(&logFile, "log", logPath, "Log File")
+	c.command.PersistentFlags().StringVar(&cfgFile, "config", "", fmt.Sprintf(`Config file (default "%s")`, configPath))
+	c.command.PersistentFlags().StringVar(&logFile, "log", logPath, "Log file")
 
 	cobra.OnInitialize(func() {
 		err := c.initConfig()

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -29,6 +29,7 @@ type Config interface {
 	Validate() error
 	DefaultConfigDir() (string, error)
 	DefaultConfigFile() string
+	DefaultLogDir() (string, error)
 	DefaultLogFile() string
 	SetConfigFile(configFile string)
 	GetConfigFile() string