From 105f03bf67db3e52f6e3975b051badd4040a80ba Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Thu, 5 Feb 2015 10:58:17 -0800
Subject: [PATCH] new conf system start

---
 cmd/warren/cmd_run.go                   |  2 +-
 cmd/warrend/{ => etc/init}/warrend.conf |  0
 cmd/warrend/main.go                     | 10 +++++-----
 lib/warren/warren.go                    | 19 ++++---------------
 4 files changed, 10 insertions(+), 21 deletions(-)
 rename cmd/warrend/{ => etc/init}/warrend.conf (100%)

diff --git a/cmd/warren/cmd_run.go b/cmd/warren/cmd_run.go
index f0b016d..78661ab 100644
--- a/cmd/warren/cmd_run.go
+++ b/cmd/warren/cmd_run.go
@@ -29,7 +29,7 @@ func runRun(cmd *warren.Command, args ...string) {
 		return
 	}
 
-	s, err := net.Dial(warren.CmdSockType(), warren.CmdSockAddr())
+	s, err := net.Dial(warren.CmdSockType, warren.CmdSockAddr)
 	if s != nil {
 		defer s.Close()
 	}
diff --git a/cmd/warrend/warrend.conf b/cmd/warrend/etc/init/warrend.conf
similarity index 100%
rename from cmd/warrend/warrend.conf
rename to cmd/warrend/etc/init/warrend.conf
diff --git a/cmd/warrend/main.go b/cmd/warrend/main.go
index b3af5b9..37d248c 100644
--- a/cmd/warrend/main.go
+++ b/cmd/warrend/main.go
@@ -58,7 +58,7 @@ func sockCmdHandle(c net.Conn) {
 
 // determine if warrend is already running
 func checkRunning() bool {
-	if pfile, err := os.Open(warren.WarrendPidFile()); err == nil {
+	if pfile, err := os.Open(warren.WarrendPidFile); err == nil {
 		// pid file exists
 		var pid int
 		n, err := fmt.Fscanf(pfile, "%d", &pid)
@@ -78,9 +78,9 @@ func checkRunning() bool {
 
 func initRunning() {
 	// rm old sock
-	os.Remove(warren.CmdSockAddr())
+	os.Remove(warren.CmdSockAddr)
 	// drop down pid
-	pidfile, err := os.Create(warren.WarrendPidFile())
+	pidfile, err := os.Create(warren.WarrendPidFile)
 	if err != nil {
 		log.Fatal("Could not create pidfile: ", warren.WarrendPidFile(), " : ", err)
 	}
@@ -88,7 +88,7 @@ func initRunning() {
 	fmt.Fprintf(pidfile, "%d", pid)
 	pidfile.Close()
 
-	cmdSock, err = net.Listen(warren.CmdSockType(), warren.CmdSockAddr())
+	cmdSock, err = net.Listen(warren.CmdSockType, warren.CmdSockAddr)
 	if err != nil {
 		fmt.Println(cmdSock)
 		Shutdown()
@@ -98,7 +98,7 @@ func initRunning() {
 }
 
 func Shutdown() {
-	os.Remove(warren.WarrendPidFile())
+	os.Remove(warren.WarrendPidFile)
 	if cmdSock != nil {
 		cmdSock.Close()
 	}
diff --git a/lib/warren/warren.go b/lib/warren/warren.go
index 1730b5c..b98bf1c 100644
--- a/lib/warren/warren.go
+++ b/lib/warren/warren.go
@@ -10,21 +10,10 @@ import (
 	"strings"
 )
 
-var cmdSockType string = "unix"
-var cmdSockAddr string = "/var/run/warrend/warrend.sock"
-var warrendPidFile string = "/var/run/warrend/warrend.pid"
-
-func CmdSockType() string {
-	return cmdSockType
-}
-
-func CmdSockAddr() string {
-	return cmdSockAddr
-}
-
-func WarrendPidFile() string {
-	return warrendPidFile
-}
+const CmdSockType string = "unix"
+const CmdSockAddr string = "/var/run/warrend/warrend.sock"
+const WarrendPidFile string = "/var/run/warrend/warrend.pid"
+const WarrendConf string = "/etc/warrend.conf"
 
 func GitHash() string {
 	hash, err := exec.Command("git", "rev-parse", "HEAD").Output()