more config work

auth/main.go

@@ -43,14 +43,6 @@ import (
 )
 
 func main() {
-	//defaultConfig, err := util.DefaultConfigLocation()
-	//if err != nil {
-	//	log.Fatalf("Error setting config file: %v", err)
-	//}
-	// Get command line arguments
-	//configFile := flag.String("config", defaultConfig, "config file to load")
-	//flag.Parse()
-
 	//Parse the command line parameters
 	config.ParseCmdParams(config.DefaultCmdLine{
 		HostName:         "localhost",

clean_build.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+cd config
+go clean; go build -o wikifeat-config
+cd ..
 cd auth
 go clean; go build -o wikifeat-auth
 cd ..

common/config/config_etcd.go

@@ -51,7 +51,6 @@ var RegistryConfigLocation = ConfigPrefix + "registry/"
 // Fetch configuration from etcd
 // Because golang has no generics, this makes heavy use of reflection :|
 func FetchConfig() {
-	LoadDefaults()
 	log.Printf("\nFetching Configuration from %v\n", Service.RegistryLocation)
 	// Get an etcd Client
 	etcdCfg := etcd.Config{

config/config_loader/config_loader.go

@@ -68,6 +68,8 @@ func InitDatabase() {
 
 //Load the configuration into etcd
 func SetConfig() {
+	log.Println("Setting service registry config")
+	setConfigItems(config.ServiceRegistry, config.RegistryConfigLocation)
 	log.Println("Setting database config")
 	setConfigItems(config.Database, config.DbConfigLocation)
 	log.Println("Setting logger config")

frontend/main.go

@@ -32,27 +32,27 @@
 package main
 
 import (
-	"flag"
 	"github.com/rhinoman/wikifeat/Godeps/_workspace/src/gopkg.in/natefinch/lumberjack.v2"
 	"github.com/rhinoman/wikifeat/common/config"
 	"github.com/rhinoman/wikifeat/common/database"
 	"github.com/rhinoman/wikifeat/common/registry"
-	"github.com/rhinoman/wikifeat/common/util"
 	"github.com/rhinoman/wikifeat/frontend/fserv"
 	"github.com/rhinoman/wikifeat/frontend/routing"
 	"log"
 )
 
 func main() {
-	defaultConfig, err := util.DefaultConfigLocation()
-	if err != nil {
-		log.Fatalf("Error settting config file: %v", err)
-	}
-	// Get Command line arguments
-	configFile := flag.String("config", defaultConfig, "config file to load")
-	flag.Parse()
-	// Load configuration
-	config.LoadConfig(*configFile)
+	//Parse the command line parameters
+	config.ParseCmdParams(config.DefaultCmdLine{
+		HostName:         "localhost",
+		NodeId:           "fe1",
+		Port:             "8081",
+		UseSSL:           false,
+		RegistryLocation: "http://localhost:2379",
+	})
+	// Fetch Configuration from etcd
+	config.FetchConfig()
+	// Load plugin ini
 	fserv.LoadPluginData(config.Frontend.PluginDir + "/plugins.ini")
 	database.InitDb()
 	// Set up the core logger

notifications/main.go

@@ -32,28 +32,27 @@
 package main
 
 import (
-	"flag"
 	"github.com/rhinoman/wikifeat/Godeps/_workspace/src/github.com/emicklei/go-restful"
 	"github.com/rhinoman/wikifeat/Godeps/_workspace/src/gopkg.in/natefinch/lumberjack.v2"
 	"github.com/rhinoman/wikifeat/common/config"
 	"github.com/rhinoman/wikifeat/common/database"
 	"github.com/rhinoman/wikifeat/common/registry"
-	"github.com/rhinoman/wikifeat/common/util"
 	"github.com/rhinoman/wikifeat/notifications/notification_service"
 	"log"
 	"net/http"
 )
 
 func main() {
-	defaultConfig, err := util.DefaultConfigLocation()
-	if err != nil {
-		log.Fatalf("Error setting config file: %v", err)
-	}
-	// Get command line arguments
-	configFile := flag.String("config", defaultConfig, "config file to load")
-	flag.Parse()
-	// Load Configuration
-	config.LoadConfig(*configFile)
+	//Parse the command line parameters
+	config.ParseCmdParams(config.DefaultCmdLine{
+		HostName:         "localhost",
+		NodeId:           "ns1",
+		Port:             "4120",
+		UseSSL:           false,
+		RegistryLocation: "http://localhost:2379",
+	})
+	// Fetch Configuration from etcd
+	config.FetchConfig()
 	// Set up Logger
 	log.SetOutput(&lumberjack.Logger{
 		Filename:   config.Logger.LogFile,