minimize code + schedulerd naming + docker

conf/conf.go

@@ -8,27 +8,26 @@ import (
 )
 
 type Config struct {
-	OcCatalogUrl 	string
-	MongoUrl		string
-	DBName			string
-	Logs 			string
-	LokiUrl			string
-	NatsUrl			string
+	MonitorPath  string
+	OcCatalogUrl string
+	MongoUrl     string
+	DBName       string
+	Logs         string
+	LokiUrl      string
+	NatsUrl      string
 }
 
 var instance *Config
 var once sync.Once
 
-const defaultConfigFile = "/etc/oc/scheduler.json"
-const localConfigFile = "./conf/local_scheduler.json"
+const defaultConfigFile = "/etc/oc/schedulerd.json"
+const localConfigFile = "./conf/local_schedulerd.json"
 
-
-func init(){
-	
+func init() {
 	configFile := ""
 	var o *onion.Onion
 
-	l3 := onion.NewEnvLayerPrefix("_", "OCSCHEDULER_")
+	l3 := onion.NewEnvLayerPrefix("_", "OCSCHEDULERD_")
 	l2, err := onion.NewFileLayer(defaultConfigFile, nil)
 	if err == nil {
 		logs.Info("Config file found : " + defaultConfigFile)
@@ -49,13 +48,13 @@ func init(){
 	} else if l2 == nil {
 		o = onion.New(l1, l3)
 	}
-
+	GetConfig().MonitorPath = o.GetStringDefault("MONITORD_PATH", "../oc-monitord/oc-monitord")
 	GetConfig().OcCatalogUrl = o.GetStringDefault("oc-catalog", "https://localhost:49618")
 	GetConfig().Logs = o.GetStringDefault("loglevel", "info")
-	GetConfig().LokiUrl = o.GetStringDefault("loki_url","http://127.0.0.1:3100")
-	GetConfig().NatsUrl = o.GetStringDefault("nats_url","http://127.0.0.1:4222")
-	GetConfig().MongoUrl = o.GetStringDefault("mongo_url","mongodb://127.0.0.1:27017")
-	GetConfig().DBName = o.GetStringDefault("database_name","DC_myDC")
+	GetConfig().LokiUrl = o.GetStringDefault("loki_url", "http://127.0.0.1:3100")
+	GetConfig().NatsUrl = o.GetStringDefault("nats_url", "http://127.0.0.1:4222")
+	GetConfig().MongoUrl = o.GetStringDefault("mongo_url", "mongodb://127.0.0.1:27017")
+	GetConfig().DBName = o.GetStringDefault("database_name", "DC_myDC")
 
 }