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
6 changes: 6 additions & 0 deletions src/OrchardCoreContrib.Diagnostics.Elm/Constants.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
namespace OrchardCoreContrib.Diagnostics.Elm;

public class Constants
{
public const string ConfigurationKey = "OrchardCoreContrib_Diagnostics_Elm";
}
4 changes: 2 additions & 2 deletions src/OrchardCoreContrib.Diagnostics.Elm/Manifest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Name = "Elm Diagnostics",
Author = ManifestConstants.Author,
Website = ManifestConstants.Website,
Version = "1.4.1",
Description = "Provides services to handle errors using Elm.",
Version = "1.6.0",
Description = "Provides services to handle errors using ASP.NET Core Error Logging Middleware (ELM).",
Category = "Infrastructure"
)]
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>1.5.0</VersionPrefix>
<VersionPrefix>1.6.0</VersionPrefix>
<Authors>The Orchard Core Contrib Team</Authors>
<Company />
<Description>Provides services to handle errors using Elm.</Description>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/OrchardCoreContrib/OrchardCoreContrib.Modules/tree/main/src/OrchardCoreContrib.Diagnostics.Elm/README.md</PackageProjectUrl>
<RepositoryUrl>https://github.com/OrchardCoreContrib/OrchardCoreContrib.Modules</RepositoryUrl>
Expand All @@ -21,6 +22,7 @@

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

<ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions src/OrchardCoreContrib.Diagnostics.Elm/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Elm Diagnostics Module

This module handle and logs errors using Elm.
This module handle and logs errors using ASP.NET Core Error Logging Middleware (ELM).

## Version

1.4.1
1.6.0

## Category

Expand All @@ -26,6 +26,7 @@ This module has no dependencies.

| Name | Version |
|-----------------------------------------------------------------------------------------------------------------|---------|
| [`OrchardCoreContrib.Diagnostics.Elm`](https://www.nuget.org/packages/OrchardCoreContrib.Diagnostics.Elm/1.6.0) | 1.6.0 |
| [`OrchardCoreContrib.Diagnostics.Elm`](https://www.nuget.org/packages/OrchardCoreContrib.Diagnostics.Elm/1.5.0) | 1.5.0 |
| [`OrchardCoreContrib.Diagnostics.Elm`](https://www.nuget.org/packages/OrchardCoreContrib.Diagnostics.Elm/1.4.1) | 1.4.1 |
| [`OrchardCoreContrib.Diagnostics.Elm`](https://www.nuget.org/packages/OrchardCoreContrib.Diagnostics.Elm/1.4.0) | 1.4.0 |
Expand All @@ -41,4 +42,4 @@ This module has no dependencies.
3. Select **Configuration -> Features** menu.
4. Enable the `Elm Diagnostics` feature.
5. Go to the site.
6. Visit the ELm end-point by append `/elm` to the URL.
6. Visit the ELm end-point by append `/elm` to the URL. In case you need to change the path, set the `Path` property of the `OrchardCoreContrib_Diagnostics_Elm` settings section from within `appsettings.json`.
36 changes: 18 additions & 18 deletions src/OrchardCoreContrib.Diagnostics.Elm/Startup.cs
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Diagnostics.Elm;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
using OrchardCore.Environment.Shell.Configuration;
using OrchardCore.Modules;
using System;

namespace OrchardCoreContrib.Diagnostics.Elm
namespace OrchardCoreContrib.Diagnostics.Elm;

/// <summary>
/// Represensts a startup point to register the required services by Elm diagnostics module.
/// </summary>
public class Startup(IShellConfiguration shellConfiguration) : StartupBase
{
/// <summary>
/// Represensts a startup point to register the required services by Elm diagnostics module.
/// </summary>
public class Startup : StartupBase
/// <inheritdoc/>
public override void ConfigureServices(IServiceCollection services)
{
/// <inheritdoc/>
public override void ConfigureServices(IServiceCollection services)
{
services.AddElm(options => options.Path = new PathString("/elm"));
}
services.Configure<ElmOptions>(shellConfiguration.GetSection(Constants.ConfigurationKey));

services.AddElm();
}

/// <inheritdoc/>
public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
{
builder.UseElmCapture();
builder.UseElmPage();
}
/// <inheritdoc/>
public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
{
builder.UseElmPage();
}
}
59 changes: 29 additions & 30 deletions src/OrchardCoreContrib.Modules.Web/Startup.cs
Original file line number Diff line number Diff line change
@@ -1,41 +1,40 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using OrchardCore.Environment.Shell;
using Microsoft.AspNetCore.Server.Kestrel.Core;
using OrchardCoreContrib.Users.Services;

namespace OrchardCoreContrib.Modules.Web
namespace OrchardCoreContrib.Modules.Web;

public class Startup
{
public class Startup
public void ConfigureServices(IServiceCollection services)
{
public void ConfigureServices(IServiceCollection services)
{
services
.AddOrchardCms(builder =>
{
builder.AddSetupFeatures("OrchardCore.AutoSetup", "OrchardCoreContrib.Tenants");
//builder.ConfigureServices(builderServices =>
//{
// builderServices.AddYesSqlDataMigrations();
// Fix IOE Synchronous operations are disallowed
services.Configure<KestrelServerOptions>(options => options.AllowSynchronousIO = true);
services.Configure<IISServerOptions>(options => options.AllowSynchronousIO = true);

// builderServices.AddScoped<MigrationUpdater>();
// builderServices.AddScoped<IFeatureEventHandler>(sp => sp.GetRequiredService<MigrationUpdater>());
//});
});
services
.AddOrchardCms(builder =>
{
builder.AddSetupFeatures("OrchardCore.AutoSetup", "OrchardCoreContrib.Tenants");
//builder.ConfigureServices(builderServices =>
//{
// builderServices.AddYesSqlDataMigrations();

// Workaround to avoid IOE on UserMenu shape
services.AddScoped<IAvatarService, NullAvatarService>();
}
// builderServices.AddScoped<MigrationUpdater>();
// builderServices.AddScoped<IFeatureEventHandler>(sp => sp.GetRequiredService<MigrationUpdater>());
//});
});

public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
if (env.IsDevelopment())
{
app.UseDeveloperExceptionPage();
}
// Workaround to avoid IOE on UserMenu shape
services.AddScoped<IAvatarService, NullAvatarService>();
}

app.UseOrchardCore();
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
if (env.IsDevelopment())
{
app.UseDeveloperExceptionPage();
}

app.UseOrchardCore();
}
}
3 changes: 3 additions & 0 deletions src/OrchardCoreContrib.Modules.Web/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
}
]
},
//"OrchardCoreContrib_Diagnostics_Elm": {
// "Path": "/elm"
//},
//"OrchardCoreContrib_HealthChecks": {
// "Url": "/health",
// "ShowDetails": true
Expand Down
Loading