Merge branch 'main' of https://cloud.o-forge.io/core/oc-workflow into main

main.go

@@ -7,36 +7,29 @@ import (
 
 	oclib "cloud.o-forge.io/core/oc-lib"
 	beego "github.com/beego/beego/v2/server/web"
-	"github.com/goraz/onion"
 	"golang.org/x/mod/modfile"
 )
 
-const hostname = "oc-workflow"
-const defaultConfigFile = "/etc/oc/conf.json"
+const appname = "oc-workflow"
 
 func main() {
-	configFile := ""
-	var o *onion.Onion
-	l3 := onion.NewEnvLayerPrefix("_", "OCWORKFLOW_")
-	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)
-	}
+	// Init the oc-lib
+	oclib.Init(appname)
+
+	// Load the right config file
+	o := oclib.GetConfLoader()
+
+	// feed the library with the loaded config
+	fmt.Println("Config file:", os.Getenv("MONGO_URL"))
 	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("LOKI_URL", "http://localhost:3100"),
-		o.GetStringDefault("LOG_LEVEL", "debug"),
+		o.GetStringDefault("LOKI_URL", ""),
+		o.GetStringDefault("LOG_LEVEL", "info"),
 	)
 	fmt.Println("Config file:", o.GetStringDefault("HOSTNAME", "localhost"))
 	// Init OC with hostname and port for discovery purpose
-	oclib.Init(hostname)
 	/* PATHS ARE REFERENCE FOR INNER SERVICE OF DISTANT OC
 	 * PATHS ARE USED TO CALL OTHER OC SERVICES
 	 * NAMES ARE CANONICAL NAMES OF THE SERVICES
@@ -44,11 +37,13 @@ func main() {
 	oclib.AddPath(oclib.LibDataEnum(oclib.BOOKING), o.GetStringDefault("BOOKING_URL", ":8092"))
 	oclib.AddPath(oclib.LibDataEnum(oclib.PEER), o.GetStringDefault("PEER_URL", ":8093"))
 	oclib.AddPath(oclib.LibDataEnum(oclib.WORKFLOW), o.GetStringDefault("WORKFLOW_URL", ":"+o.GetStringDefault("PORT", "8088")))
-	// Normal beego init
-	//if beego.BConfig.RunMode == "dev" {
+
+	// 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()
 }