Working on compose dependencies and check new httpclient handlers ret…

…ries
adamholthaus50 · May 22, 2018 · 70a2682 · 70a2682
1 parent 460fc99
commit 70a2682
Show file tree

Hide file tree

Showing 13 changed files with 124 additions and 545 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,25 @@
 version: '3.4'
 
 services:
+ sql.data:
+ image: microsoft/mssql-server-linux:2017-latest
+
+ nosql.data:
+ image: mongo
+
+ basket.data:
+ image: redis:alpine
+
+ rabbitmq:
+ image: rabbitmq:3-management-alpine
+
+ identity.api:
+ image: eshop/identity.api:${TAG:-latest}
+ build:
+ context: .
+ dockerfile: src/Services/Identity/Identity.API/Dockerfile 
+ depends_on:
+ - sql.data
 
  basket.api:
  image: eshop/basket.api:${TAG:-latest}
@@ -21,14 +40,6 @@ services:
  - sql.data
  - rabbitmq
 
- identity.api:
- image: eshop/identity.api:${TAG:-latest}
- build:
- context: .
- dockerfile: src/Services/Identity/Identity.API/Dockerfile 
- depends_on:
- - sql.data
-
  ordering.api:
  image: eshop/ordering.api:${TAG:-latest}
  build:
@@ -58,36 +69,6 @@ services:
  - identity.api
  - rabbitmq
 
- webspa:
- image: eshop/webspa:${TAG:-latest}
- build:
- context: .
- dockerfile: src/Web/WebSPA/Dockerfile 
- depends_on:
- - catalog.api
- - ordering.api
- - identity.api
- - basket.api
- - marketing.api
-
- webmvc:
- image: eshop/webmvc:${TAG:-latest}
- build:
- context: .
- dockerfile: src/Web/WebMVC/Dockerfile 
- depends_on:
- - catalog.api
- - ordering.api
- - identity.api
- - basket.api
- - marketing.api
-
- webstatus:
- image: eshop/webstatus:${TAG:-latest}
- build:
- context: .
- dockerfile: src/Web/WebStatus/Dockerfile
-
  payment.api:
  image: eshop/payment.api:${TAG:-latest}
  build:
@@ -105,57 +86,135 @@ services:
  - nosql.data
  - rabbitmq
 
- sql.data:
- image: microsoft/mssql-server-linux:2017-latest
-
- nosql.data:
- image: mongo
-
- basket.data:
- image: redis:alpine
-
- rabbitmq:
- image: rabbitmq:3-management-alpine
-
  mobileshoppingapigw:
  image: eshop/ocelotapigw:${TAG:-latest}
  build:
  context: .
  dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
+ depends_on:
+ - nosql.data
+ - sql.data
+ - identity.api
+ - rabbitmq
+ - ordering.api
+ - marketing.api
+ - catalog.api
+ - basket.api
 
  mobilemarketingapigw:
  image: eshop/ocelotapigw:${TAG:-latest}
  build:
  context: .
  dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
+ depends_on:
+ - nosql.data
+ - sql.data
+ - identity.api
+ - rabbitmq
+ - ordering.api
+ - marketing.api
+ - catalog.api
+ - basket.api
 
  webshoppingapigw:
  image: eshop/ocelotapigw:${TAG:-latest}
  build:
  context: .
  dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
+ depends_on:
+ - nosql.data
+ - sql.data
+ - identity.api
+ - rabbitmq
+ - ordering.api
+ - marketing.api
+ - catalog.api
+ - basket.api
 
  webmarketingapigw:
  image: eshop/ocelotapigw:${TAG:-latest}
  build:
  context: .
  dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
+ depends_on:
+ - nosql.data
+ - sql.data
+ - identity.api
+ - rabbitmq
+ - ordering.api
+ - marketing.api
+ - catalog.api
+ - basket.api
 
  mobileshoppingagg:
  image: eshop/mobileshoppingagg:${TAG:-latest}
  build:
  context: .
  dockerfile: src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
+ depends_on:
+ - nosql.data
+ - sql.data
+ - identity.api
+ - rabbitmq
+ - ordering.api
+ - marketing.api
+ - catalog.api
+ - basket.api
 
  webshoppingagg:
  image: eshop/webshoppingagg:${TAG:-latest}
  build:
  context: .
  dockerfile: src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
+ depends_on:
+ - nosql.data
+ - sql.data
+ - identity.api
+ - rabbitmq
+ - ordering.api
+ - marketing.api
+ - catalog.api
+ - basket.api
 
  ordering.signalrhub:
  image: eshop/ordering.signalrhub:${TAG:-latest}
  build:
  context: .
  dockerfile: src/Services/Ordering/Ordering.SignalrHub/Dockerfile
+ depends_on:
+ - nosql.data
+ - sql.data
+ - identity.api
+ - rabbitmq
+ - ordering.api
+ - marketing.api
+ - catalog.api
+ - basket.api
+
+ webstatus:
+ image: eshop/webstatus:${TAG:-latest}
+ build:
+ context: .
+ dockerfile: src/Web/WebStatus/Dockerfile
+
+ webspa:
+ image: eshop/webspa:${TAG:-latest}
+ build:
+ context: .
+ dockerfile: src/Web/WebSPA/Dockerfile 
+ depends_on:
+ - webshoppingagg
+ - webshoppingapigw
+ - webmarketingapigw
+
+
+ webmvc:
+ image: eshop/webmvc:${TAG:-latest}
+ build:
+ context: .
+ dockerfile: src/Web/WebMVC/Dockerfile 
+ depends_on:
+ - webshoppingagg
+ - webshoppingapigw
+ - webmarketingapigw
 
diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln
@@ -128,8 +128,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.BackgroundTasks",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.SignalrHub", "src\Services\Ordering\Ordering.SignalrHub\Ordering.SignalrHub.csproj", "{E1D2B260-4E7F-4A88-BC13-9910F7C44623}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ordering.BackgroundTasksHost", "src\Services\Ordering\Ordering.BackgroundTasksHost\Ordering.BackgroundTasksHost.csproj", "{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}"
-EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -1536,54 +1534,6 @@ Global
  {E1D2B260-4E7F-4A88-BC13-9910F7C44623}.Release|x64.Build.0 = Release|Any CPU
  {E1D2B260-4E7F-4A88-BC13-9910F7C44623}.Release|x86.ActiveCfg = Release|Any CPU
  {E1D2B260-4E7F-4A88-BC13-9910F7C44623}.Release|x86.Build.0 = Release|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|Any CPU.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|ARM.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|ARM.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|iPhone.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|x64.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|x64.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|x86.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|x86.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|ARM.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|iPhone.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|x64.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|x64.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|x86.ActiveCfg = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|x86.Build.0 = Debug|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|Any CPU.Build.0 = Release|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|ARM.ActiveCfg = Release|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|ARM.Build.0 = Release|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|iPhone.ActiveCfg = Release|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|iPhone.Build.0 = Release|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|x64.ActiveCfg = Release|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|x64.Build.0 = Release|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|x86.ActiveCfg = Release|Any CPU
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|x86.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE
@@ -1639,7 +1589,6 @@ Global
  {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1} = {28C0F5C8-4849-4035-80AB-45639424E73F}
  {7D63ED4A-3EDA-4BBA-8BBA-F46BD6430931} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
  {E1D2B260-4E7F-4A88-BC13-9910F7C44623} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
- {CA566CD5-A49A-47F7-BDC9-592E36DAF74E} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
  EndGlobalSection
  GlobalSection(ExtensibilityGlobals) = postSolution
  SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9}

diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs
@@ -11,10 +11,12 @@
 using Microsoft.Extensions.Logging;
 using Polly;
 using Polly.Extensions.Http;
+using Polly.Timeout;
 using Swashbuckle.AspNetCore.Swagger;
 using System;
 using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
+using System.Net.Http;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
 {
@@ -148,9 +150,12 @@ public static IServiceCollection AddApplicationServices(this IServiceCollection
  services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
  //register http services
+
  var retriesWithExponentialBackoff = HttpPolicyExtensions
- .HandleTransientHttpError()
- .WaitAndRetryAsync(7, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
+ .HandleTransientHttpError()
+ .Or<TimeoutRejectedException>()
+ .OrResult(message => message.StatusCode == System.Net.HttpStatusCode.NotFound)
+ .WaitAndRetryAsync(7, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
 
  var circuitBreaker = HttpPolicyExtensions
  .HandleTransientHttpError()

diff --git a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs
@@ -27,9 +27,9 @@ public static class IWebHostExtensions
  var retry = Policy.Handle<SqlException>()
  .WaitAndRetry(new TimeSpan[]
  {
+ TimeSpan.FromSeconds(3),
  TimeSpan.FromSeconds(5),
- TimeSpan.FromSeconds(10),
- TimeSpan.FromSeconds(15),
+ TimeSpan.FromSeconds(8),
  });
 
  retry.Execute(() =>

diff --git a/src/Services/Ordering/Ordering.BackgroundTasksHost/Configuration/BackgroundTaskSettings.cs b/src/Services/Ordering/Ordering.BackgroundTasksHost/Configuration/BackgroundTaskSettings.cs
diff --git a/...ng/Ordering.BackgroundTasksHost/IntegrationEvents/GracePeriodConfirmedIntegrationEvent.cs b/...ng/Ordering.BackgroundTasksHost/IntegrationEvents/GracePeriodConfirmedIntegrationEvent.cs