config upgrale & cleanup

main.go

@@ -4,41 +4,18 @@ import (
 	"oc-aggregator/models"
 	_ "oc-aggregator/routers"
 
-	"github.com/beego/beego/logs"
+	oclib "cloud.o-forge.io/core/oc-lib"
 	beego "github.com/beego/beego/v2/server/web"
-	"github.com/goraz/onion"
 )
 
-const defaultConfigFile = "/etc/oc/aggregator.json"
-const localConfigFile = "./aggregator.json"
+const appname = "oc-aggregator"
 
 func main() {
-	log := logs.NewLogger(10000)
-	log.SetLogger("console")
+	// Init the oc-lib
+	oclib.Init(appname)
 
-	configFile := ""
-	var o *onion.Onion
-	l3 := onion.NewEnvLayerPrefix("_", "OCAGGREGATOR_")
-	l2, err := onion.NewFileLayer(defaultConfigFile, nil)
-	if err == nil {
-		logs.Info("Config file found : " + defaultConfigFile)
-		configFile = defaultConfigFile
-	}
-	l1, err := onion.NewFileLayer(localConfigFile, nil)
-	if err == nil {
-		logs.Info("Local config file found " + localConfigFile + ", overriding default file")
-		configFile = localConfigFile
-	}
-	if configFile == "" {
-		logs.Info("No config file found, using env")
-		o = onion.New(l3)
-	} else if l1 == nil && l2 == nil {
-		o = onion.New(l1, l2, l3)
-	} else if l1 == nil {
-		o = onion.New(l2, l3)
-	} else if l2 == nil {
-		o = onion.New(l1, l3)
-	}
+	// Load the right config file
+	o := oclib.GetConfLoader()
 
 	models.GetConfig().RedisUrl = o.GetStringDefault("redisurl", "localhost:6379")
 	models.GetConfig().RedisPassword = o.GetStringDefault("redispassword", "")
@@ -46,10 +23,20 @@ func main() {
 	models.GetConfig().ZincLogin = o.GetStringDefault("zinclogin", "admin")
 	models.GetConfig().ZincPassword = o.GetStringDefault("zincpassword", "admin")
 	models.GetConfig().DiscoveryUrl = o.GetStringDefault("discoveryurl", "http://localhost:8080/oc/")
+	// feed the library with the loaded config
+	oclib.SetConfig(
+		o.GetStringDefault("MONGO_URL", "mongodb://127.0.0.1:27017"),
+		o.GetStringDefault("MONGO_DATABASE", "DC_myDC"),
+		"",
+		o.GetStringDefault("lokiurl", ""),
+		o.GetStringDefault("loglevel", "info"),
+	)
+	// Beego init
+	beego.BConfig.AppName = appname
+	beego.BConfig.Listen.HTTPPort = o.GetIntDefault("port", 8080)
+	beego.BConfig.WebConfig.DirectoryIndex = true
+	beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
 
-	if beego.BConfig.RunMode == "dev" {
-		beego.BConfig.WebConfig.DirectoryIndex = true
-		beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
-	}
 	beego.Run()
+
 }