diff --git a/config/conf.go b/config/conf.go index 064f0f9..a9f2bdd 100644 --- a/config/conf.go +++ b/config/conf.go @@ -27,6 +27,7 @@ type Config struct { InternalWorkspaceAPI string InternalPeerAPI string InternalDatacenterAPI string + InternalSchedulerAPI string } func (c Config) GetUrl() string { @@ -49,7 +50,8 @@ func GetConfig() *Config { func SetConfig(mongoUrl string, database string, natsUrl string, lokiUrl string, logLevel string, port int, pkPath, ppPath, - internalCatalogAPI, internalSharedAPI, internalWorkflowAPI, internalWorkspaceAPI, internalPeerAPI, internalDatacenterAPI string) *Config { + internalCatalogAPI, internalSharedAPI, internalWorkflowAPI, internalWorkspaceAPI, + internalPeerAPI, internalDatacenterAPI string, internalSchedulerAPI string) *Config { GetConfig().MongoUrl = mongoUrl GetConfig().MongoDatabase = database GetConfig().NATSUrl = natsUrl @@ -66,5 +68,6 @@ func SetConfig(mongoUrl string, database string, natsUrl string, lokiUrl string, GetConfig().InternalWorkspaceAPI = internalWorkspaceAPI GetConfig().InternalPeerAPI = internalPeerAPI GetConfig().InternalDatacenterAPI = internalDatacenterAPI + GetConfig().InternalSchedulerAPI = internalSchedulerAPI return GetConfig() } diff --git a/entrypoint.go b/entrypoint.go index cb940d5..49352e8 100644 --- a/entrypoint.go +++ b/entrypoint.go @@ -165,6 +165,7 @@ func InitDaemon(appName string) { o.GetStringDefault("INTERNAL_WORKSPACE_API", "oc-workspace"), o.GetStringDefault("INTERNAL_PEER_API", "oc-peer"), o.GetStringDefault("INTERNAL_DATACENTER_API", "oc-datacenter"), + o.GetStringDefault("INTERNAL_SCHEDULER_API", "oc-scheduler"), ) // Beego init beego.BConfig.AppName = appName @@ -254,8 +255,10 @@ func GetLogger() zerolog.Logger { */ func SetConfig(mongoUrl string, database string, natsUrl string, lokiUrl string, logLevel string, port int, pppath string, pkpath 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) + internalCatalogAPI, internalSharedAPI, internalWorkflowAPI, + internalWorkspaceAPI, internalPeerAPI, internalDatacenterAPI string, internalSchedulerAPI string) *config.Config { + cfg := config.SetConfig(mongoUrl, database, natsUrl, lokiUrl, logLevel, port, pkpath, pppath, internalCatalogAPI, internalSharedAPI, internalWorkflowAPI, + internalWorkspaceAPI, internalPeerAPI, internalDatacenterAPI, internalSchedulerAPI) 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()))) diff --git a/tools/enums.go b/tools/enums.go index 4416ee4..a1d52d0 100644 --- a/tools/enums.go +++ b/tools/enums.go @@ -55,6 +55,11 @@ var PEERSAPI = func() string { var DATACENTERAPI = func() string { return config.GetConfig().InternalDatacenterAPI } + +var SCHEDULERAPI = func() string { + return config.GetConfig().InternalSchedulerAPI +} + var PURCHASEAPI = func() string { return config.GetConfig().InternalCatalogAPI + "/purchase" } @@ -73,7 +78,7 @@ var InnerDefaultAPI = [...]func() string{ PEERSAPI, SHAREDAPI, SHAREDAPI, - DATACENTERAPI, + SCHEDULERAPI, NOAPI, NOAPI, NOAPI, @@ -82,7 +87,7 @@ var InnerDefaultAPI = [...]func() string{ DATACENTERAPI, NOAPI, CATALOGAPI, - DATACENTERAPI, + SCHEDULERAPI, } // Bind the standard data name to the data type @@ -166,6 +171,7 @@ const ( PB_CONSIDERS PB_ADMIRALTY_CONFIG PB_MINIO_CONFIG + PB_CLOSE_SEARCH NONE ) @@ -191,12 +197,15 @@ func GetActionString(ss string) PubSubAction { return PB_ADMIRALTY_CONFIG case "minio_config": return PB_MINIO_CONFIG + case "close_search": + return PB_CLOSE_SEARCH default: return NONE } } -var path = []string{"search", "search_response", "create", "update", "delete", "planner", "close_planner", "considers", "admiralty_config", "minio_config"} +var path = []string{"search", "search_response", "create", "update", "delete", "planner", "close_planner", + "considers", "admiralty_config", "minio_config", "close_search"} func (m PubSubAction) String() string { return strings.ToUpper(path[m])