Workin service

main.go

@@ -1,36 +1,30 @@
 package main
 
 import (
-	"oc-workflow/conf"
+	"fmt"
 	_ "oc-workflow/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/workflow.json"
-const localConfigFile = "./workflow.json"
+const localConfigFile = "./docker_workflow.json"
 
 func main() {
-	log := logs.NewLogger(10000)
-	log.SetLogger("console")
-
 	configFile := ""
 	var o *onion.Onion
 	l3 := onion.NewEnvLayerPrefix("_", "OCWORKFLOW_")
-	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
 	}
+	l2, err := onion.NewFileLayer(defaultConfigFile, nil)
+	if err == nil {
+		configFile = defaultConfigFile
+	}
 	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)
@@ -39,11 +33,13 @@ func main() {
 	} else if l2 == nil {
 		o = onion.New(l1, l3)
 	}
-
-	conf.GetConfig().MongoUrl = o.GetStringDefault("mongourl", "http://localhost:4080")
-	conf.GetConfig().MongoLogin = o.GetStringDefault("mongologin", "admin")
-	conf.GetConfig().MongoPassword = o.GetStringDefault("mongopassword", "admin")
-
+	fmt.Println("BSLDMqlkd", o.GetStringDefault("MONGO_URL", "mongodb://127.0.0.1:27017"),
+		o.GetStringDefault("MONGO_DATABASE", "DC_myDC-demo_06042021"))
+	oclib.SetConfig(
+		o.GetStringDefault("MONGO_URL", "mongodb://127.0.0.1:27017"),
+		o.GetStringDefault("MONGO_DATABASE", "DC_myDC-demo_06042021"),
+	)
+	oclib.Init("oc-workflow")
 	// Normal beego init
 	//if beego.BConfig.RunMode == "dev" {
 	beego.BConfig.WebConfig.DirectoryIndex = true