upgrade main.go (oc-lib refactor)

main.go

@@ -4,33 +4,27 @@ import (
 	_ "oc-peers/routers"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
-	"cloud.o-forge.io/core/oc-lib/tools"
 	beego "github.com/beego/beego/v2/server/web"
-	"github.com/goraz/onion"
 )
 
-const defaultConfigFile = "/etc/oc/conf.json"
+const appname = "oc-peers"
 
 func main() {
-	configFile := ""
-	var o *onion.Onion
-	l3 := onion.NewEnvLayerPrefix("_", "OCSCHEDULER_")
-	l2, err := onion.NewFileLayer(defaultConfigFile, nil)
-	if err == nil {
-		configFile = defaultConfigFile
-	}
-	if configFile == "" || l2 == nil {
-		o = onion.New(l3)
-	} else {
-		o = onion.New(l2, l3)
-	}
-	tools.SetConfig(
+	// Init the oc-lib
+	oclib.Init(appname)
+
+	// Load the right config file
+	o := oclib.GetConfLoader()
+
+	// 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("NATS_URL", "nats://localhost:4222"),
+		o.GetStringDefault("lokiurl", ""),
+		o.GetStringDefault("loglevel", "info"),
 	)
-	// Init OC with hostname and port for discovery purpose
-	oclib.Init("oc-peers", o.GetStringDefault("HOSTNAME", "localhost"), o.GetStringDefault("PORT", "8093"))
+
 	/* PATHS ARE REFERENCE FOR INNER SERVICE OF DISTANT OC
 	 * PATHS ARE USED TO CALL OTHER OC SERVICES
 	 * NAMES ARE CANONICAL NAMES OF THE SERVICES
@@ -39,8 +33,12 @@ func main() {
 	oclib.AddPath(oclib.LibDataEnum(oclib.WORKFLOW), o.GetStringDefault("WORKFLOW_URL", ":8088"))
 	oclib.AddPath(oclib.LibDataEnum(oclib.WORKSPACE), o.GetStringDefault("WORKSPACE_URL", ":8089"))
 	oclib.AddPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), o.GetStringDefault("SHARED_WORKSPACE_URL", ":8091"))
-	// Normal beego init
+
+	// 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"
+
 	beego.Run()
 }