Skip to content

Use runtime mode to determine cache TTL for manifest files #16393

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
kjac merged 2 commits into from
May 27, 2024
Merged

Use runtime mode to determine cache TTL for manifest files #16393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc4899
Use runtime mode to determine cache TTL for manifest files
kjac May 24, 2024
133b69e
Remove unused manifest settings
kjac May 24, 2024
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
10 changes: 0 additions & 10 deletions src/Umbraco.Core/Configuration/Models/PackageManifestSettings.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ public static IUmbracoBuilder AddConfiguration(this IUmbracoBuilder builder)
.AddUmbracoOptions<ContentDashboardSettings>()
.AddUmbracoOptions<HelpPageSettings>()
.AddUmbracoOptions<DataTypesSettings>()
.AddUmbracoOptions<PackageManifestSettings>()
.AddUmbracoOptions<WebhookSettings>();

// Configure connection string and ensure it's updated when the configuration changes
Expand Down
12 changes: 8 additions & 4 deletions src/Umbraco.Infrastructure/Manifest/PackageManifestService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,18 @@ internal sealed class PackageManifestService : IPackageManifestService
{
private readonly IEnumerable<IPackageManifestReader> _packageManifestReaders;
private readonly IAppPolicyCache _cache;
private readonly PackageManifestSettings _packageManifestSettings;
private RuntimeSettings _runtimeSettings;


public PackageManifestService(
IEnumerable<IPackageManifestReader> packageManifestReaders,
AppCaches appCaches,
IOptions<PackageManifestSettings> packageManifestSettings)
IOptionsMonitor<RuntimeSettings> runtimeSettingsOptionsMonitor)
{
_packageManifestReaders = packageManifestReaders;
_packageManifestSettings = packageManifestSettings.Value;
_cache = appCaches.RuntimeCache;
_runtimeSettings = runtimeSettingsOptionsMonitor.CurrentValue;
runtimeSettingsOptionsMonitor.OnChange(runtimeSettings => _runtimeSettings = runtimeSettings);
}

public async Task<IEnumerable<PackageManifest>> GetAllPackageManifestsAsync()
Expand All @@ -34,7 +36,9 @@ public async Task<IEnumerable<PackageManifest>> GetAllPackageManifestsAsync()

return tasks.SelectMany(x => x.Result);
},
_packageManifestSettings.CacheTimeout)
_runtimeSettings.Mode == RuntimeMode.Production
? TimeSpan.FromDays(30)
: TimeSpan.FromSeconds(10))
?? Array.Empty<PackageManifest>();

public async Task<IEnumerable<PackageManifest>> GetPublicPackageManifestsAsync()
Expand Down
9 changes: 6 additions & 3 deletions tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/PackageManifestServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Microsoft.Extensions.Options;
using Moq;
using Moq;
using NUnit.Framework;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Manifest;
using Umbraco.Cms.Infrastructure.Manifest;
using Umbraco.Cms.Tests.Common;

namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Manifest;

Expand Down Expand Up @@ -32,7 +32,10 @@ public void SetUp()
NoAppCache.Instance,
new IsolatedCaches(type => NoAppCache.Instance));

_service = new PackageManifestService(new[] { _readerMock.Object }, appCaches, new OptionsWrapper<PackageManifestSettings>(new PackageManifestSettings()));
_service = new PackageManifestService(
new[] { _readerMock.Object },
appCaches,
new TestOptionsMonitor<RuntimeSettings>(new RuntimeSettings { Mode = RuntimeMode.Production }));
}

[Test]
Expand Down