Skip to content
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
15 changes: 3 additions & 12 deletions src/OrchardCoreContrib.Tenants/HealthChecks/TenantsHealthCheck.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,18 @@

namespace OrchardCoreContrib.Tenants.HealthChecks;

public class TenantsHealthCheck : IHealthCheck
public class TenantsHealthCheck(IShellHost shellHost, IServiceProvider serviceProvider) : IHealthCheck
{
internal const string Name = "Tenants Health Check";

private readonly IShellHost _shellHost;
private readonly IServiceProvider _serviceProvider;

public TenantsHealthCheck(IShellHost shellHost, IServiceProvider serviceProvider)
{
_shellHost = shellHost;
_serviceProvider = serviceProvider;
}

public Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
{
var nonRunningTenants = _shellHost.GetAllSettings()
var nonRunningTenants = shellHost.GetAllSettings()
.Where(s => !s.IsDefaultShell() && s.State != TenantState.Running);
if (nonRunningTenants.Any())
{
var description = String.Empty;
var localizer = _serviceProvider.GetService<IStringLocalizer<TenantsHealthCheck>>();
var localizer = serviceProvider.GetService<IStringLocalizer<TenantsHealthCheck>>();

if (nonRunningTenants.Count() == 1)
{
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.Tenants/Manifest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Name = "Multitenancy",
Author = ManifestConstants.Author,
Website = ManifestConstants.Website,
Version = "1.2.1",
Version = "1.4.0",
Description = "Provides a way to manage tenants from the admin.",
Category = "Infrastructure",
Dependencies = new [] { "OrchardCore.Tenants" },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>1.3.0</VersionPrefix>
<VersionPrefix>1.4.0</VersionPrefix>
<Authors>The Orchard Core Contrib Team</Authors>
<Company />
<Description>Provides features to manage tenants from the Admin UI.</Description>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/OrchardCoreContrib/OrchardCoreContrib.Modules/tree/main/src/OrchardCoreContrib.Tenants/README.md</PackageProjectUrl>
<RepositoryUrl>https://github.com/OrchardCoreContrib/OrchardCoreContrib.Modules</RepositoryUrl>
Expand All @@ -25,6 +26,7 @@

<ItemGroup>
<None Include="../../images/icon.png" Pack="true" PackagePath="icon.png" />
<None Include="README.md" Pack="true" PackagePath="\"/>
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/OrchardCoreContrib.Tenants/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This module provides features to manage tenants from the Admin UI.

## Version

1.2.1
1.4.0

## Category

Expand All @@ -28,6 +28,7 @@ Infrastructure

| Name | Version |
|-------------------------------------------------------------------------------------------------|---------|
| [`OrchardCoreContrib.Tenants`](https://www.nuget.org/packages/OrchardCoreContrib.Tenants/1.4.0) | 1.4.0 |
| [`OrchardCoreContrib.Tenants`](https://www.nuget.org/packages/OrchardCoreContrib.Tenants/1.3.0) | 1.3.0 |
| [`OrchardCoreContrib.Tenants`](https://www.nuget.org/packages/OrchardCoreContrib.Tenants/1.2.1) | 1.2.1 |
| [`OrchardCoreContrib.Tenants`](https://www.nuget.org/packages/OrchardCoreContrib.Tenants/1.2.0) | 1.2.0 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
using Microsoft.Extensions.Options;
using OrchardCore.Modules;
using OrchardCoreContrib.HealthChecks;
using OrchardCoreContrib.Tenants.HealthChecks;

namespace OrchardCoreContrib.Tenants.HealthChecks;
namespace OrchardCoreContrib.Tenants;

[RequireFeatures("OrchardCoreContrib.HealthChecks")]
public class Startup : StartupBase
Expand Down
Loading