Skip to content

The license status check fails when checking the license against a secured RavenDB instance #5274

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.

Sign up for GitHub

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

Merged
mauroservienti merged 5 commits into from
Jan 22, 2026
Merged

The license status check fails when checking the license against a secured RavenDB instance #5274

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da94042
Use the internal RavenDB HTTP client
mauroservienti Jan 22, 2026
913345a
extract the server URL from the document store
mauroservienti Jan 22, 2026
9425a4e
Refactor license status check with cancellation token
ramonsmits Jan 22, 2026
25a8151
Fix whitespace
ramonsmits Jan 22, 2026
d0d33bf
Make the primary instance LicenseStatusCheck behave like the audit in…
mauroservienti Jan 22, 2026
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
2 changes: 1 addition & 1 deletion src/ServiceControl.Audit.Persistence.RavenDB/DatabaseSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public async Task Execute(IDocumentStore documentStore, CancellationToken cancel

await CreateIndexes(documentStore, configuration.EnableFullTextSearch, cancellationToken);

await LicenseStatusCheck.WaitForLicenseOrThrow(configuration, cancellationToken);
await LicenseStatusCheck.WaitForLicenseOrThrow(documentStore, cancellationToken);
await ConfigureExpiration(documentStore, cancellationToken);
}

Expand Down
12 changes: 5 additions & 7 deletions src/ServiceControl.Audit.Persistence.RavenDB/LicenseStatusCheck.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
namespace ServiceControl.Audit.Persistence.RavenDB;

using System;
using System.Net.Http;
using System.Net.Http.Json;
using System.Threading;
using System.Threading.Tasks;
using Raven.Client.Documents;

static class LicenseStatusCheck
{
record LicenseStatusFragment(string Id, string LicensedTo, string Status, bool Expired);

public static async Task WaitForLicenseOrThrow(DatabaseConfiguration configuration, CancellationToken cancellationToken)
public static async Task WaitForLicenseOrThrow(IDocumentStore documentStore, CancellationToken cancellationToken)
{
using var client = new HttpClient
{
BaseAddress = new Uri(configuration.ServerConfiguration.ConnectionString ?? configuration.ServerConfiguration.ServerUrl)
};
var ravenConfiguredHttpClient = documentStore.GetRequestExecutor().HttpClient;
var licenseCheckUrl = documentStore.Urls[0].TrimEnd('/') + "/license/status";

// Not linking to the incoming cancellationToken to ensure no OperationCancelledException prevents the last InvalidOperationException to be thrown
Comment thread
mauroservienti marked this conversation as resolved.
Outdated
using var cts = new CancellationTokenSource(30_000);
while (!cts.IsCancellationRequested)
{
var httpResponse = await client.GetAsync("license/status", cancellationToken);
var httpResponse = await ravenConfiguredHttpClient.GetAsync(licenseCheckUrl, cancellationToken);
var licenseStatus = await httpResponse.Content.ReadFromJsonAsync<LicenseStatusFragment>(cancellationToken);
if (licenseStatus.Expired)
{
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceControl.Persistence.RavenDB/DatabaseSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public async Task Execute(CancellationToken cancellationToken)

await IndexCreation.CreateIndexesAsync(typeof(DatabaseSetup).Assembly, documentStore, null, null, cancellationToken);

await LicenseStatusCheck.WaitForLicenseOrThrow(settings, cancellationToken);
await LicenseStatusCheck.WaitForLicenseOrThrow(documentStore, cancellationToken);
await ConfigureExpiration(settings, cancellationToken);
}

Expand Down
12 changes: 5 additions & 7 deletions src/ServiceControl.Persistence.RavenDB/LicenseStatusCheck.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
namespace ServiceControl.Persistence.RavenDB;

using System;
using System.Net.Http;
using System.Net.Http.Json;
using System.Threading;
using System.Threading.Tasks;
using Raven.Client.Documents;

static class LicenseStatusCheck
{
record LicenseStatusFragment(string Id, string LicensedTo, string Status, bool Expired);

public static async Task WaitForLicenseOrThrow(RavenPersisterSettings configuration, CancellationToken cancellationToken)
public static async Task WaitForLicenseOrThrow(IDocumentStore documentStore, CancellationToken cancellationToken)
{
using var client = new HttpClient
{
BaseAddress = new Uri(configuration.ConnectionString ?? configuration.ServerUrl)
};
var ravenConfiguredHttpClient = documentStore.GetRequestExecutor().HttpClient;
var licenseCheckUrl = documentStore.Urls[0].TrimEnd('/') + "/license/status";

// Not linking to the incoming cancellationToken to ensure no OperationCancelledException prevents the last InvalidOperationException to be thrown
using var cts = new CancellationTokenSource(30_000);
while (!cts.IsCancellationRequested)
{
var httpResponse = await client.GetAsync("license/status", cancellationToken);
var httpResponse = await ravenConfiguredHttpClient.GetAsync(licenseCheckUrl, cancellationToken);
var licenseStatus = await httpResponse.Content.ReadFromJsonAsync<LicenseStatusFragment>(cancellationToken);
if (licenseStatus.Expired)
{
Expand Down