Merge pull request #6 from paulhammond/file_args2

File args

Author: troy

config_manager.go

@@ -36,8 +36,9 @@ type ConfigFile struct {
 }
 
 type ConfigManager struct {
-	Config ConfigFile
-	Flags  struct {
+	Config    ConfigFile
+	FlagFiles []string
+	Flags     struct {
 		Hostname        string
 		DestHost        string
 		DestPort        int
@@ -169,6 +170,7 @@ func (cm *ConfigManager) parseFlags() {
 	pflag.StringVar(&cm.Flags.DebugLogFile, "debug-log-cfg", "", "the debug log file")
 	pflag.StringVar(&cm.Flags.LogLevels, "log", "<root>=INFO", "\"logging configuration <root>=INFO;first=TRACE\"")
 	pflag.Parse()
+	cm.FlagFiles = pflag.Args()
 }
 
 func (cm *ConfigManager) readConfig() error {
@@ -276,7 +278,7 @@ func (cm *ConfigManager) Facility() syslog.Priority {
 }
 
 func (cm *ConfigManager) Files() []string {
-	return cm.Config.Files
+	return append(cm.FlagFiles, cm.Config.Files...)
 }
 
 func (cm *ConfigManager) DebugLogFile() string {

remote_syslog.go

@@ -68,7 +68,7 @@ func globFiles(globs []string, excludedFiles []*regexp.Regexp, excludePatterns [
 	log.Debugf("Evaluating file globs")
 	for _, glob := range globs {
 
-		files, err := filepath.Glob(glob)
+		files, err := filepath.Glob(utils.ResolvePath(glob))
 
 		if err != nil {
 			log.Errorf("Failed to glob %s: %s", glob, err)

utils/daemonize.go

@@ -6,14 +6,34 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"path/filepath"
 
 	"github.com/VividCortex/godaemon"
 	"github.com/nightlyone/lockfile"
 )
 
 const CanDaemonize = true
 
+func ResolvePath(path string) string {
+
+	if filepath.IsAbs(path) {
+		return path
+	}
+
+	return filepath.Join(os.Getenv("__DAEMON_CWD"), path)
+}
+
 func Daemonize(logFilePath, pidFilePath string) {
+
+	if os.Getenv("__DAEMON_CWD") == "" {
+		cwd, err := os.Getwd()
+		if err != nil {
+			fmt.Fprintln(os.Stderr, "Cannot determine working directory: %v", err)
+			os.Exit(1)
+		}
+		os.Setenv("__DAEMON_CWD", cwd)
+	}
+
 	logFile, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0666)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Could not open local log file: %v", err)

utils/daemonize_windows.go

@@ -2,6 +2,10 @@ package utils
 
 const CanDaemonize = false
 
+func ResolvePath(path string) string {
+	return path
+}
+
 func Daemonize(logFilePath, pidFilePath string) {
 	panic("cannot daemonize on windows")
 }