Browse Source

remove try catch

pull/886/head
Erik Pique 6 years ago
parent
commit
4362eb0dce
2 changed files with 16 additions and 30 deletions
  1. +8
    -15
      ServiceFabric/Linux/eShopOnServiceFabricApiGateWays/ApiGw_Base/Controllers/ConfigurationController.cs
  2. +8
    -15
      ServiceFabric/Windows/eShopOnServiceFabricApiGateWays/eShopOnServiceFabricApiGW/ApiGw_Base/Controllers/ConfigurationController.cs

+ 8
- 15
ServiceFabric/Linux/eShopOnServiceFabricApiGateWays/ApiGw_Base/Controllers/ConfigurationController.cs View File

@ -24,25 +24,18 @@ namespace ApiGw_Base.Controllers
private IActionResult ReadConfigurationFile(ConfigurationType configurationType, ConfigurationBffType configurationBffType) private IActionResult ReadConfigurationFile(ConfigurationType configurationType, ConfigurationBffType configurationBffType)
{ {
try
var path = $"{AppDomain.CurrentDomain.BaseDirectory}/Configurations/configuration.{configurationType}.Bff.{configurationBffType}.json";
using (var streamReader = new StreamReader(path, Encoding.UTF8))
{ {
var path = $"{AppDomain.CurrentDomain.BaseDirectory}/Configurations/configuration.{configurationType}.Bff.{configurationBffType}.json";
var jsonString = streamReader.ReadToEnd();
using (var streamReader = new StreamReader(path, Encoding.UTF8))
if (string.IsNullOrWhiteSpace(jsonString))
{ {
var jsonString = streamReader.ReadToEnd();
if (string.IsNullOrWhiteSpace(jsonString))
{
return BadRequest($"Configuration file 'configuration.{configurationType}.Bff.{configurationBffType}.json' not found");
}
return Ok(jsonString);
return BadRequest($"Configuration file 'configuration.{configurationType}.Bff.{configurationBffType}.json' not found");
} }
}
catch (Exception exception)
{
return BadRequest(exception.Message);
return Ok(jsonString);
} }
} }
} }

+ 8
- 15
ServiceFabric/Windows/eShopOnServiceFabricApiGateWays/eShopOnServiceFabricApiGW/ApiGw_Base/Controllers/ConfigurationController.cs View File

@ -24,25 +24,18 @@ namespace ApiGw_Base.Controllers
private IActionResult ReadConfigurationFile(ConfigurationType configurationType, ConfigurationBffType configurationBffType) private IActionResult ReadConfigurationFile(ConfigurationType configurationType, ConfigurationBffType configurationBffType)
{ {
try
var path = $"{AppDomain.CurrentDomain.BaseDirectory}/Configurations/configuration.{configurationType}.Bff.{configurationBffType}.json";
using (var streamReader = new StreamReader(path, Encoding.UTF8))
{ {
var path = $"{AppDomain.CurrentDomain.BaseDirectory}/Configurations/configuration.{configurationType}.Bff.{configurationBffType}.json";
var jsonString = streamReader.ReadToEnd();
using (var streamReader = new StreamReader(path, Encoding.UTF8))
if (string.IsNullOrWhiteSpace(jsonString))
{ {
var jsonString = streamReader.ReadToEnd();
if (string.IsNullOrWhiteSpace(jsonString))
{
return BadRequest($"Configuration file 'configuration.{configurationType}.Bff.{configurationBffType}.json' not found");
}
return Ok(jsonString);
return BadRequest($"Configuration file 'configuration.{configurationType}.Bff.{configurationBffType}.json' not found");
} }
}
catch (Exception exception)
{
return BadRequest(exception.Message);
return Ok(jsonString);
} }
} }
} }

Loading…
Cancel
Save