tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-04-23 00:32:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix bug： (#810)" (#823)

Browse Source 
This reverts commit 19c80afb05290fac3a144f652cd663c8b513a559.
This commit is contained in:
Thiago Loureiro 2019-03-19 23:26:50 +01:00 committed by GitHub
parent 9bb59ab567
commit cb3989a714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Ocelot.Provider.Consul/Consul.cs
View File

@ -27,7 +27,7 @@
public async Task<List<Service>> Get()
{
var queryResult = await _consul.Catalog.Service(_config.KeyOfServiceInConsul, string.Empty);
var queryResult = await _consul.Health.Service(_config.KeyOfServiceInConsul, string.Empty, true);
var services = new List<Service>();
@ -39,26 +39,26 @@
}
else
{
_logger.LogWarning($"Unable to use service Address: {serviceEntry.Address} and Port: {serviceEntry.ServicePort} as it is invalid. Address must contain host only e.g. localhost and port must be greater than 0");
_logger.LogWarning($"Unable to use service Address: {serviceEntry.Service.Address} and Port: {serviceEntry.Service.Port} as it is invalid. Address must contain host only e.g. localhost and port must be greater than 0");
}
}
return services.ToList();
}
private Service BuildService(CatalogService serviceEntry)
private Service BuildService(ServiceEntry serviceEntry)
{
return new Service(
serviceEntry.ServiceName,
new ServiceHostAndPort(serviceEntry.Address, serviceEntry.ServicePort),
serviceEntry.ServiceID,
GetVersionFromStrings(serviceEntry.ServiceTags),
serviceEntry.ServiceTags ?? Enumerable.Empty<string>());
serviceEntry.Service.Service,
new ServiceHostAndPort(serviceEntry.Service.Address, serviceEntry.Service.Port),
serviceEntry.Service.ID,
GetVersionFromStrings(serviceEntry.Service.Tags),
serviceEntry.Service.Tags ?? Enumerable.Empty<string>());
}
private bool IsValid(CatalogService serviceEntry)
private bool IsValid(ServiceEntry serviceEntry)
{
if (string.IsNullOrEmpty(serviceEntry.Address) || serviceEntry.Address.Contains("http://") || serviceEntry.Address.Contains("https://") || serviceEntry.ServicePort <= 0)
if (string.IsNullOrEmpty(serviceEntry.Service.Address) || serviceEntry.Service.Address.Contains("http://") || serviceEntry.Service.Address.Contains("https://") || serviceEntry.Service.Port <= 0)
{
return false;
}