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

main upgrade

Browse Source
This commit is contained in:
ycc
2024-09-02 17:52:12 +02:00
parent e341aca84e
commit 7d5af4c2eb
8 changed files with 233 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
main.go
View File

@@ -4,42 +4,23 @@ import (
"oc-discovery/models"
_ "oc-discovery/routers"
"github.com/beego/beego/logs"
oclib "cloud.o-forge.io/core/oc-lib"
"cloud.o-forge.io/core/oc-lib/logs"
"cloud.o-forge.io/core/oc-lib/tools"
beego "github.com/beego/beego/v2/server/web"
"github.com/goraz/onion"
)
const defaultConfigFile = "/etc/oc/discovery.json"
const localConfigFile = "./discovery.json"
const appname = "oc-discovery"
func main() {
log := logs.NewLogger(10000)
log.SetLogger("console")
// Init the oc-lib
oclib.Init(appname, "", "")
// get the right config file
configFile := ""
var o *onion.Onion
l3 := onion.NewEnvLayerPrefix("_", "OCDISCOVERY_")
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
}
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)
} else if l1 == nil {
o = onion.New(l2, l3)
} else if l2 == nil {
o = onion.New(l1, l3)
}
o := tools.GetConfLoader()
models.GetConfig().Port = o.GetIntDefault("port", 8080)
models.GetConfig().LokiUrl = o.GetStringDefault("lokiurl", "")
models.GetConfig().RedisUrl = o.GetStringDefault("redisurl", "localhost:6379")
models.GetConfig().RedisPassword = o.GetStringDefault("redispassword", "")
models.GetConfig().ZincUrl = o.GetStringDefault("zincurl", "http://localhost:4080")
@@ -48,10 +29,16 @@ func main() {
models.GetConfig().IdentityFile = o.GetStringDefault("identityfile", "./identity.json")
models.GetConfig().Defaultpeers = o.GetStringDefault("defaultpeers", "./peers.json")
// set oc-lib logger
if models.GetConfig().LokiUrl != "" {
logs.CreateLogger(appname, models.GetConfig().LokiUrl)
}
// Normal beego init
//if beego.BConfig.RunMode == "dev" {
beego.BConfig.AppName = appname
beego.BConfig.Listen.HTTPPort = models.GetConfig().Port
beego.BConfig.WebConfig.DirectoryIndex = true
beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
//}
beego.Run()
}