new oclib 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.Str[d]
|
||||
}
|
||||
|
||||
// will turn into standards name
|
||||
|
||||
@@ -29,7 +29,7 @@ type PeerCache struct {
|
||||
|
||||
// urlFormat formats the URL of the peer with the data type API function
|
||||
func urlFormat(hostUrl string, dt tools.DataType) string {
|
||||
return hostUrl + "/" + strings.ReplaceAll(dt.API(), "oc-", "")
|
||||
return hostUrl + "/" + strings.ReplaceAll(dt.String(), "oc-", "")
|
||||
}
|
||||
|
||||
// checkPeerStatus checks the status of a peer
|
||||
@@ -62,7 +62,7 @@ func (p *PeerCache) LaunchPeerExecution(peerID string, dataID string,
|
||||
url := ""
|
||||
|
||||
// Check the status of the peer
|
||||
if mypeer, ok := CheckPeerStatus(peerID, dt.API()); !ok && mypeer != nil {
|
||||
if mypeer, ok := CheckPeerStatus(peerID, dt.String()); !ok && mypeer != nil {
|
||||
// If the peer is not reachable, add the execution to the failed executions list
|
||||
pexec := &PeerExecution{
|
||||
Method: method.String(),
|
||||
|
||||
@@ -157,7 +157,7 @@ func (a *API) CheckRemoteAPIs(apis []DataType) (State, map[string]string, error)
|
||||
reachable := false
|
||||
for _, api := range apis { // Check the state of each remote API in the list
|
||||
var resp APIStatusResponse
|
||||
b, err := caller.CallGet("http://"+api.API()+":8080", "/oc/version/status") // Call the status endpoint of the remote API (standard OC status endpoint)
|
||||
b, err := caller.CallGet("http://"+api.InnerAPI()+":8080", "/oc/version/status") // Call the status endpoint of the remote API (standard OC status endpoint)
|
||||
if err != nil {
|
||||
l.Error().Msg(api.String() + " not reachable")
|
||||
state = REDUCED_SERVICE // If a remote API is not reachable, return reduced service
|
||||
|
||||
@@ -84,7 +84,7 @@ var MINIO = func() string {
|
||||
}
|
||||
|
||||
// Bind the standard API name to the data type
|
||||
var DefaultAPI = [...]func() string{
|
||||
var InnerDefaultAPI = [...]func() string{
|
||||
NOAPI,
|
||||
CATALOGAPI,
|
||||
CATALOGAPI,
|
||||
@@ -151,8 +151,8 @@ func FromInt(i int) string {
|
||||
return Str[i]
|
||||
}
|
||||
|
||||
func (d DataType) API() string { // API - Returns the API name of the data type
|
||||
return DefaultAPI[d]()
|
||||
func (d DataType) InnerAPI() string { // API - Returns the API name of the data type
|
||||
return InnerDefaultAPI[d]()
|
||||
}
|
||||
|
||||
func (d DataType) String() string { // String - Returns the string name of the data type
|
||||
|
||||
Reference in New Issue
Block a user