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

oclib PB_CLOSE_SEARCH

Browse Source
This commit is contained in:
mr
2026-03-12 15:11:50 +01:00
parent a30173921f
commit a335c905b3
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/conf.go
View File

@@ -27,6 +27,7 @@ type Config struct {
InternalWorkspaceAPI string InternalWorkspaceAPI string
InternalPeerAPI string InternalPeerAPI string
InternalDatacenterAPI string InternalDatacenterAPI string
InternalSchedulerAPI string
} }
func (c Config) GetUrl() 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, func SetConfig(mongoUrl string, database string, natsUrl string, lokiUrl string, logLevel string, port int,
pkPath, ppPath, pkPath, ppPath,
internalCatalogAPI, internalSharedAPI, internalWorkflowAPI, internalWorkspaceAPI, internalPeerAPI, internalDatacenterAPI string) *Config { internalCatalogAPI, internalSharedAPI, internalWorkflowAPI, internalWorkspaceAPI,
internalPeerAPI, internalDatacenterAPI string, internalSchedulerAPI string) *Config {
GetConfig().MongoUrl = mongoUrl GetConfig().MongoUrl = mongoUrl
GetConfig().MongoDatabase = database GetConfig().MongoDatabase = database
GetConfig().NATSUrl = natsUrl GetConfig().NATSUrl = natsUrl
@@ -66,5 +68,6 @@ func SetConfig(mongoUrl string, database string, natsUrl string, lokiUrl string,
GetConfig().InternalWorkspaceAPI = internalWorkspaceAPI GetConfig().InternalWorkspaceAPI = internalWorkspaceAPI
GetConfig().InternalPeerAPI = internalPeerAPI GetConfig().InternalPeerAPI = internalPeerAPI
GetConfig().InternalDatacenterAPI = internalDatacenterAPI GetConfig().InternalDatacenterAPI = internalDatacenterAPI
GetConfig().InternalSchedulerAPI = internalSchedulerAPI
return GetConfig() return GetConfig()
} }

7
entrypoint.go
View File

@@ -165,6 +165,7 @@ func InitDaemon(appName string) {
o.GetStringDefault("INTERNAL_WORKSPACE_API", "oc-workspace"), o.GetStringDefault("INTERNAL_WORKSPACE_API", "oc-workspace"),
o.GetStringDefault("INTERNAL_PEER_API", "oc-peer"), o.GetStringDefault("INTERNAL_PEER_API", "oc-peer"),
o.GetStringDefault("INTERNAL_DATACENTER_API", "oc-datacenter"), o.GetStringDefault("INTERNAL_DATACENTER_API", "oc-datacenter"),
o.GetStringDefault("INTERNAL_SCHEDULER_API", "oc-scheduler"),
) )
// Beego init // Beego init
beego.BConfig.AppName = appName beego.BConfig.AppName = appName
@@ -254,8 +255,10 @@ func GetLogger() zerolog.Logger {
*/ */
func SetConfig(mongoUrl string, database string, natsUrl string, lokiUrl string, logLevel string, func SetConfig(mongoUrl string, database string, natsUrl string, lokiUrl string, logLevel string,
port int, pppath string, pkpath string, port int, pppath string, pkpath string,
internalCatalogAPI, internalSharedAPI, internalWorkflowAPI, internalWorkspaceAPI, internalPeerAPI, internalDatacenterAPI string) *config.Config { internalCatalogAPI, internalSharedAPI, internalWorkflowAPI,
cfg := config.SetConfig(mongoUrl, database, natsUrl, lokiUrl, logLevel, port, pkpath, pppath, internalCatalogAPI, internalSharedAPI, internalWorkflowAPI, internalWorkspaceAPI, internalPeerAPI, internalDatacenterAPI) 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() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
tools.UncatchedError = append(tools.UncatchedError, errors.New("Panic recovered in Init : "+fmt.Sprintf("%v", r)+" - "+string(debug.Stack()))) tools.UncatchedError = append(tools.UncatchedError, errors.New("Panic recovered in Init : "+fmt.Sprintf("%v", r)+" - "+string(debug.Stack())))

15
tools/enums.go
View File

@@ -55,6 +55,11 @@ var PEERSAPI = func() string {
var DATACENTERAPI = func() string { var DATACENTERAPI = func() string {
return config.GetConfig().InternalDatacenterAPI return config.GetConfig().InternalDatacenterAPI
} }
var SCHEDULERAPI = func() string {
return config.GetConfig().InternalSchedulerAPI
}
var PURCHASEAPI = func() string { var PURCHASEAPI = func() string {
return config.GetConfig().InternalCatalogAPI + "/purchase" return config.GetConfig().InternalCatalogAPI + "/purchase"
} }
@@ -73,7 +78,7 @@ var InnerDefaultAPI = [...]func() string{
PEERSAPI, PEERSAPI,
SHAREDAPI, SHAREDAPI,
SHAREDAPI, SHAREDAPI,
DATACENTERAPI, SCHEDULERAPI,
NOAPI, NOAPI,
NOAPI, NOAPI,
NOAPI, NOAPI,
@@ -82,7 +87,7 @@ var InnerDefaultAPI = [...]func() string{
DATACENTERAPI, DATACENTERAPI,
NOAPI, NOAPI,
CATALOGAPI, CATALOGAPI,
DATACENTERAPI, SCHEDULERAPI,
} }
// Bind the standard data name to the data type // Bind the standard data name to the data type
@@ -166,6 +171,7 @@ const (
PB_CONSIDERS PB_CONSIDERS
PB_ADMIRALTY_CONFIG PB_ADMIRALTY_CONFIG
PB_MINIO_CONFIG PB_MINIO_CONFIG
PB_CLOSE_SEARCH
NONE NONE
) )
@@ -191,12 +197,15 @@ func GetActionString(ss string) PubSubAction {
return PB_ADMIRALTY_CONFIG return PB_ADMIRALTY_CONFIG
case "minio_config": case "minio_config":
return PB_MINIO_CONFIG return PB_MINIO_CONFIG
case "close_search":
return PB_CLOSE_SEARCH
default: default:
return NONE 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 { func (m PubSubAction) String() string {
return strings.ToUpper(path[m]) return strings.ToUpper(path[m])