core/deprecated-oc-catalog
6
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Modified DCName and DBPoint retrieving

Browse Source
This commit is contained in:
pb
2023-12-04 14:46:36 +01:00
parent 67d36b533f
commit c8508a4976
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main.go
View File

@@ -27,11 +27,13 @@ func main() {
routers.Init() routers.Init()
services.Init() services.Init()
beego.BConfig.RunMode = "dev"
// if beego.BConfig.RunMode == "dev" { // if beego.BConfig.RunMode == "dev" {
// // beego.BConfig.WebConfig.DirectoryIndex = true // // beego.BConfig.WebConfig.DirectoryIndex = true
beego.BConfig.WebConfig.DirectoryIndex = true beego.BConfig.WebConfig.DirectoryIndex = true
beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger" beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
// } // }
@@ -71,7 +73,7 @@ func loadConfig(){
o = onion.New(l1, l3) o = onion.New(l1, l3)
} }
conf.GetConfig().MongoURL = o.GetStringDefault("MongoURL", "mongodb://127.0.0.1:27017/beego-demo") conf.GetConfig().MongoURL = o.GetStringDefault("MongoURL", "mongodb://127.0.0.1:27017")
conf.GetConfig().DCNAME = o.GetStringDefault("DCNAME", "DC_myDC") conf.GetConfig().DCNAME = o.GetStringDefault("DCNAME", "DC_myDC")
conf.GetConfig().DBPOINT = o.GetStringDefault("DBPOINT", "demdemo_06042021o") conf.GetConfig().DBPOINT = o.GetStringDefault("DBPOINT", "demdemo_06042021o")

2
routers/router.go
View File

@@ -79,8 +79,6 @@ func Init() {
), ),
) )
// Namespace containing useful Path such as ping
beego.AddNamespace(ns) beego.AddNamespace(ns)

37
services/init.go
View File

@@ -1,29 +1,44 @@
package services package services
import ( import (
"os" "cloud.o-forge.io/core/oc-catalog/conf"
"github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/core/logs"
beego "github.com/beego/beego/v2/server/web"
) )
func Init() { func Init() {
Discoveryinit() //First init DC name // Discoveryinit() //First init DC name
config := conf.GetConfig()
var DBpoint string var DBpoint string
var DC_NAME string
var err error var err error
DC_NAME = config.DCNAME
DBpoint = os.Getenv("DOCKER_DBPOINT") if len(DC_NAME) == 0 {
if len(DBpoint) == 0 { logs.Critical("DC_NAME URI error: %v", err)
DBpoint, err = beego.AppConfig.String("DBPOINT") panic(err)
if err != nil {
logs.Critical("DBPOINT URI error: %v", err)
panic(err)
}
} }
DBpoint = config.DBPOINT
if len(DBpoint) == 0 {
logs.Critical("DBPOINT URI error: %v", err)
panic(err)
}
// if len(DBpoint) == 0 {
// DBpoint, err = beego.AppConfig.String("DBPOINT")
// if err != nil {
// logs.Critical("DBPOINT URI error: %v", err)
// panic(err)
// }
// }
logs.Debug("connecting to datacenter db : " + DC_NAME + "-" + DBpoint)
Mongoinit(DC_NAME + "-" + DBpoint) Mongoinit(DC_NAME + "-" + DBpoint)
} }