huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/2.2' 

# Conflicts:
#	version.props
This commit is contained in:
Pranav K 2018-08-29 10:13:33 -07:00
parent 241208dee0 6cd4cf1a7a
commit db40c80cea
No known key found for this signature in database
GPG Key ID: 1963DA6D96C3057A
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.props
View File

@ -44,6 +44,6 @@
<XunitPackageVersion>2.3.1</XunitPackageVersion> <XunitPackageVersion>2.3.1</XunitPackageVersion>
<XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion> <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Package Versions: Pinned" />
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " /> <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
<PropertyGroup Label="Package Versions: Pinned" />
</Project> </Project>

4
samples/HealthChecksSample/LivenessProbeStartup.cs
View File

@ -43,14 +43,14 @@ namespace HealthChecksSample
// //
// In this example, the liveness check will us an 'identity' check that always returns healthy. // In this example, the liveness check will us an 'identity' check that always returns healthy.
// //
// In this example, the readiness check will run all registered checks, include a check with an // In this example, the readiness check will run all registered checks, include a check with a
// long initialization time (15 seconds). // long initialization time (15 seconds).
// The readiness check uses all of the registered health checks (default) // The readiness check uses all of the registered health checks (default)
app.UseHealthChecks("/health/ready"); app.UseHealthChecks("/health/ready");
// The liveness check uses an 'identity' health check that always returns healty // The liveness check uses an 'identity' health check that always returns healthy
app.UseHealthChecks("/health/live", new HealthCheckOptions() app.UseHealthChecks("/health/live", new HealthCheckOptions()
{ {
// Filters the set of health checks run by this middleware // Filters the set of health checks run by this middleware

2
samples/HealthChecksSample/ManagementPortStartup.cs
View File

@ -34,7 +34,7 @@ namespace HealthChecksSample
// to the specified port. This is typically used in a container environment where you can expose // to the specified port. This is typically used in a container environment where you can expose
// a port for monitoring services to have access to the service. // a port for monitoring services to have access to the service.
// - In this case the management is configured in the launchSettings.json and passed through // - In this case the management is configured in the launchSettings.json and passed through
// and environment variable // an environment variable
// - Additionally, the server is also configured to listen to requests on the management port. // - Additionally, the server is also configured to listen to requests on the management port.
app.UseHealthChecks("/health", port: Configuration["ManagementPort"]); app.UseHealthChecks("/health", port: Configuration["ManagementPort"]);

2
samples/HealthChecksSample/SlowDependencyHealthCheck.cs
View File

@ -4,7 +4,7 @@ using Microsoft.Extensions.Diagnostics.HealthChecks;
namespace HealthChecksSample namespace HealthChecksSample
{ {
// Simulates a health check for an application dependency that takes a while to initialize. // Simulates a health check for an application dependency that takes a while to initialize.
// This is part of the readiness/liveness probe sample. // This is part of the readiness/liveness probe sample.
public class SlowDependencyHealthCheck : IHealthCheck public class SlowDependencyHealthCheck : IHealthCheck
{ {