oclib latest major version

main.go

@@ -1,43 +1,33 @@
 package main
 
 import (
-	"fmt"
 	_ "oc-shared/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/shared.json"
-const localConfigFile = "./docker_shared.json"
 
 func main() {
 	configFile := ""
 	var o *onion.Onion
 	l3 := onion.NewEnvLayerPrefix("_", "OCSHARED_")
-	l1, err := onion.NewFileLayer(localConfigFile, nil)
-	if err == nil {
-		configFile = localConfigFile
-	}
 	l2, err := onion.NewFileLayer(defaultConfigFile, nil)
 	if err == nil {
 		configFile = defaultConfigFile
 	}
-	if configFile == "" {
+	if configFile == "" || l2 == nil {
 		o = onion.New(l3)
-	} else if l1 == nil && l2 == nil {
-		o = onion.New(l1, l2, l3)
-	} else if l1 == nil {
+	} else {
 		o = onion.New(l2, l3)
-	} else if l2 == nil {
-		o = onion.New(l1, l3)
 	}
-	fmt.Println("BSLDMqlkd", o.GetStringDefault("MONGO_URL", "mongodb://127.0.0.1:27017"),
-		o.GetStringDefault("MONGO_DATABASE", "DC_myDC"))
-	oclib.SetConfig(
+	tools.SetConfig(
 		o.GetStringDefault("MONGO_URL", "mongodb://127.0.0.1:27017"),
 		o.GetStringDefault("MONGO_DATABASE", "DC_myDC"),
+		"",
 	)
 	oclib.Init("oc-shared")
 	oclib.AddPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), o.GetStringDefault("SHARED_WORKSPACE_URL", ":8091"))