New dynamic URL match
This commit is contained in:
@@ -92,7 +92,7 @@ func GenerateNodeID() (string, error) {
|
||||
|
||||
// will turn into standards api hostnames
|
||||
func (d LibDataEnum) API() string {
|
||||
return tools.DefaultAPI[d]
|
||||
return tools.DefaultAPI[d]()
|
||||
}
|
||||
|
||||
// will turn into standards name
|
||||
@@ -151,6 +151,13 @@ func InitDaemon(appName string) {
|
||||
o.GetIntDefault("API_PORT", 8080),
|
||||
o.GetStringDefault("PUBLIC_KEY_PATH", "./pem/public.pem"),
|
||||
o.GetStringDefault("PRIVATE_KEY_PATH", "./pem/private.pem"),
|
||||
|
||||
o.GetStringDefault("INTERNAL_CATALOG_API", "oc-catalog"),
|
||||
o.GetStringDefault("INTERNAL_SHARED_API", "oc-shared"),
|
||||
o.GetStringDefault("INTERNAL_WORKFLOW_API", "oc-workflow"),
|
||||
o.GetStringDefault("INTERNAL_WORKSPACE_API", "oc-workspace"),
|
||||
o.GetStringDefault("INTERNAL_PEER_API", "oc-peer"),
|
||||
o.GetStringDefault("INTERNAL_DATACENTER_API", "oc-datacenter"),
|
||||
)
|
||||
// Beego init
|
||||
beego.BConfig.AppName = appName
|
||||
@@ -238,8 +245,10 @@ func GetLogger() zerolog.Logger {
|
||||
* @param logLevel string
|
||||
* @return *Config
|
||||
*/
|
||||
func SetConfig(mongoUrl string, database string, natsUrl string, lokiUrl string, logLevel string, port int, pkpath string, pppath string) *config.Config {
|
||||
cfg := config.SetConfig(mongoUrl, database, natsUrl, lokiUrl, logLevel, port, pkpath, pppath)
|
||||
func SetConfig(mongoUrl string, database string, natsUrl string, lokiUrl string, logLevel string,
|
||||
port int, pkpath string, pppath string,
|
||||
internalCatalogAPI, internalSharedAPI, internalWorkflowAPI, internalWorkspaceAPI, internalPeerAPI, internalDatacenterAPI string) *config.Config {
|
||||
cfg := config.SetConfig(mongoUrl, database, natsUrl, lokiUrl, logLevel, port, pkpath, pppath, internalCatalogAPI, internalSharedAPI, internalWorkflowAPI, internalWorkspaceAPI, internalPeerAPI, internalDatacenterAPI)
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
tools.UncatchedError = append(tools.UncatchedError, errors.New("Panic recovered in Init : "+fmt.Sprintf("%v", r)+" - "+string(debug.Stack())))
|
||||
|
||||
Reference in New Issue
Block a user