Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add MessagingHostHealthCheck #271

Merged
merged 1 commit into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup Label="Globals">
<SccProjectName>SAK</SccProjectName>
<SccProvider>SAK</SccProvider>
<SccAuxPath>SAK</SccAuxPath>
<SccLocalPath>SAK</SccLocalPath>
</PropertyGroup>
<PropertyGroup Label="Globals">
<SccProjectName>SAK</SccProjectName>
<SccProvider>SAK</SccProvider>
<SccAuxPath>SAK</SccAuxPath>
<SccLocalPath>SAK</SccLocalPath>
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Description>A few lightweight messaging abstractions</Description>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Description>A few lightweight messaging abstractions</Description>
</PropertyGroup>

<ItemGroup>
<None Remove="NBB.Messaging.Abstractions.csproj.vspscc" />
</ItemGroup>
<ItemGroup>
<None Remove="NBB.Messaging.Abstractions.csproj.vspscc" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Core\NBB.Core.Abstractions\NBB.Core.Abstractions.csproj" />
<ProjectReference Include="..\..\Core\NBB.Core.Pipeline\NBB.Core.Pipeline.csproj" />
<ProjectReference Include="..\..\Correlation\NBB.Correlation\NBB.Correlation.csproj" />
<ProjectReference Include="..\NBB.Messaging.DataContracts\NBB.Messaging.DataContracts.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Core\NBB.Core.Abstractions\NBB.Core.Abstractions.csproj" />
<ProjectReference Include="..\..\Core\NBB.Core.Pipeline\NBB.Core.Pipeline.csproj" />
<ProjectReference Include="..\..\Correlation\NBB.Correlation\NBB.Correlation.csproj" />
<ProjectReference Include="..\NBB.Messaging.DataContracts\NBB.Messaging.DataContracts.csproj" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions src/Messaging/NBB.Messaging.Host/IMessagingHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public interface IMessagingHost
public Task StartAsync(CancellationToken cancellationToken = default);
public Task StopAsync(CancellationToken cancellationToken = default);
public void ScheduleRestart(TimeSpan delay = default);
public bool IsRunning();
}


Expand Down
3 changes: 3 additions & 0 deletions src/Messaging/NBB.Messaging.Host/Internal/MessagingHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@ public async Task StopAsync(CancellationToken cancellationToken = default)

}

public bool IsRunning() => _isStarted == 1 && _isStarting == 0 && _isStopping == 0 && _isScheduledRestart == 0;

private void ExecuteCancellation(CancellationTokenSource cancel)
{
// Noop if this is already cancelled
Expand All @@ -234,5 +236,6 @@ public void Dispose()
{
_transportMonitor.OnError -= OnTransportError;
}

}
}
29 changes: 29 additions & 0 deletions src/Messaging/NBB.Messaging.Host/MessagingHostHealthCheck.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Copyright (c) TotalSoft.
// This source code is licensed under the MIT license.

using Microsoft.Extensions.Diagnostics.HealthChecks;
using System.Threading;
using System.Threading.Tasks;

namespace NBB.Messaging.Host
{
public class MessagingHostHealthCheck : IHealthCheck
{
private readonly IMessagingHost _messagingHost;

public MessagingHostHealthCheck(IMessagingHost messagingHost)
{
_messagingHost = messagingHost;
}

public Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
{
if (_messagingHost.IsRunning())
{
return Task.FromResult(HealthCheckResult.Healthy("MessagingHost is running."));
}

return Task.FromResult(HealthCheckResult.Unhealthy("MessagingHost is not running."));
}
}
}
55 changes: 28 additions & 27 deletions src/Messaging/NBB.Messaging.Host/NBB.Messaging.Host.csproj
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Description>Messaging subscriber host</Description>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Description>Messaging subscriber host</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Scrutor" Version="$(ScrutorPackageVersion)" />
<PackageReference Include="MediatR" Version="$(MediatRPackageVersion)" />
<PackageReference Include="Polly" Version="$(PollyVersion)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsPackagesVersion)" />
<PackageReference Include="Scrutor" Version="$(ScrutorPackageVersion)" />
<PackageReference Include="MediatR" Version="$(MediatRPackageVersion)" />
<PackageReference Include="Polly" Version="$(PollyVersion)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Core\NBB.Core.Abstractions\NBB.Core.Abstractions.csproj" />
<ProjectReference Include="..\..\Core\NBB.Core.Effects\NBB.Core.Effects.csproj" />
<ProjectReference Include="..\..\Core\NBB.Core.Pipeline\NBB.Core.Pipeline.csproj" />
<ProjectReference Include="..\..\Correlation\NBB.Correlation\NBB.Correlation.csproj" />
<ProjectReference Include="..\NBB.Messaging.Abstractions\NBB.Messaging.Abstractions.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Core\NBB.Core.Abstractions\NBB.Core.Abstractions.csproj" />
<ProjectReference Include="..\..\Core\NBB.Core.Effects\NBB.Core.Effects.csproj" />
<ProjectReference Include="..\..\Core\NBB.Core.Pipeline\NBB.Core.Pipeline.csproj" />
<ProjectReference Include="..\..\Correlation\NBB.Correlation\NBB.Correlation.csproj" />
<ProjectReference Include="..\NBB.Messaging.Abstractions\NBB.Messaging.Abstractions.csproj" />
</ItemGroup>

<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>$(AssemblyName).Tests</_Parameter1>
</AssemblyAttribute>
</ItemGroup>
<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>$(AssemblyName).Tests</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

</Project>