Skip to content

Commit 9cff047

Browse files
committed
Fix issue SPA HealthCheck Urls
1 parent 4182750 commit 9cff047

4 files changed

Lines changed: 18 additions & 9 deletions

File tree

docker-compose.override.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ services:
5656
- CatalogUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101
5757
- OrderingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
5858
- IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
59-
- BasketUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
59+
- BasketUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
60+
- CatalogUrlHC=http://catalog.api:5101/hc
61+
- OrderingUrlHC=http://ordering.api:5102/hc
62+
- IdentityUrlHC=http://identity.api:5105/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
63+
- BasketUrlHC=http://basket.api:5103/hc
6064
ports:
6165
- "5104:5104"
6266

docker-compose.prod.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,11 @@ services:
6161
- CatalogUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101
6262
- OrderingUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5102
6363
- IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105.
64-
- BasketUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103
64+
- BasketUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103
65+
- CatalogUrlHC=http://catalog.api:5101/hc
66+
- OrderingUrlHC=http://ordering.api:5102/hc
67+
- IdentityUrlHC=http://identity.api:5105/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
68+
- BasketUrlHC=http://basket.api:5103/hc
6569
ports:
6670
- "5104:5104"
6771

src/Web/WebSPA/Startup.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ public void ConfigureServices(IServiceCollection services)
5151
minutes = minutesParsed;
5252
}
5353

54-
checks.AddUrlCheck(Configuration["CatalogUrl"] + "/hc", TimeSpan.FromMinutes(minutes));
55-
checks.AddUrlCheck(Configuration["OrderingUrl"] + "/hc", TimeSpan.FromMinutes(minutes));
56-
checks.AddUrlCheck(Configuration["BasketUrl"] + "/hc", TimeSpan.FromMinutes(minutes));
57-
checks.AddUrlCheck(Configuration["IdentityUrl"] + "/hc", TimeSpan.FromMinutes(minutes));
54+
checks.AddUrlCheck(Configuration["CatalogUrlHC"], TimeSpan.FromMinutes(minutes));
55+
checks.AddUrlCheck(Configuration["OrderingUrlHC"], TimeSpan.FromMinutes(minutes));
56+
checks.AddUrlCheck(Configuration["BasketUrlHC"], TimeSpan.FromMinutes(minutes));
57+
checks.AddUrlCheck(Configuration["IdentityUrlHC"], TimeSpan.FromMinutes(minutes));
5858
});
5959

6060
services.Configure<AppSettings>(Configuration);

src/Web/WebStatus/Views/Shared/_Layout.cshtml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@
4848
<div class="container body-content">
4949
@RenderBody()
5050
</div>
51-
<footer class="container footer">
52-
<p class="center">&copy; 2017 - WebStatus</p>
53-
</footer>
51+
<br />
52+
<div id="footer">
53+
<p>&nbsp;&copy; 2017 - WebStatus</p>
54+
</div>
5455

5556

5657
<environment names="Development">

0 commit comments

Comments
 (0)