Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Revert "Add detailed error logging for HTML/PDF generation failures (#684)" (#686)

Krzysztof Pajak49cc9a854ce9
diff --git a/src/Business/Grand.Business.Common/Services/Pdf/HtmlToPdfService.cs b/src/Business/Grand.Business.Common/Services/Pdf/HtmlToPdfService.cs
index e5daab2c8..d6f107098 100644
--- a/src/Business/Grand.Business.Common/Services/Pdf/HtmlToPdfService.cs
+++ b/src/Business/Grand.Business.Common/Services/Pdf/HtmlToPdfService.cs
@@ -6,7 +6,6 @@ using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.SharedKernel.Extensions;
using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Logging;
using Scryber;
using Scryber.Components;
using Path = System.IO.Path;
@@ -22,21 +21,18 @@ public class HtmlToPdfService : IPdfService
private const string ShipmentsTemplate = "~/Views/PdfTemplates/ShipmentPdfTemplate.cshtml";
private readonly IRepository<Download> _downloadRepository;
private readonly ILanguageService _languageService;
- private readonly ILogger<HtmlToPdfService> _logger;
private readonly IStoreFilesContext _storeFilesContext;
private readonly IViewRenderService _viewRenderService;
private readonly IWebHostEnvironment _webHostEnvironment;
public HtmlToPdfService(IViewRenderService viewRenderService, IRepository<Download> downloadRepository,
- ILanguageService languageService, IStoreFilesContext storeFilesContext, IWebHostEnvironment webHostEnvironment,
- ILogger<HtmlToPdfService> logger)
+ ILanguageService languageService, IStoreFilesContext storeFilesContext, IWebHostEnvironment webHostEnvironment)
{
_viewRenderService = viewRenderService;
_languageService = languageService;
_downloadRepository = downloadRepository;
_storeFilesContext = storeFilesContext;
_webHostEnvironment = webHostEnvironment;
- _logger = logger;
}
public async Task PrintOrdersToPdf(Stream stream, IList<Order> orders, string languageId = "",
@@ -47,17 +43,9 @@ public class HtmlToPdfService : IPdfService
var html = await _viewRenderService.RenderToStringAsync(OrderTemplate,
new ValueTuple<IList<Order>, string>(orders, vendorId));
- try
- {
- TextReader sr = new StringReader(html);
- using var doc = Document.ParseDocument(sr, ParseSourceType.DynamicContent);
- doc.SaveAsPDF(stream);
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Error generating PDF from order HTML. HTML content: {Html}", html);
- throw;
- }
+ TextReader sr = new StringReader(html);
+ using var doc = Document.ParseDocument(sr, ParseSourceType.DynamicContent);
+ doc.SaveAsPDF(stream);
}
public async Task<string> PrintOrderToPdf(Order order, string languageId, string vendorId = "")
@@ -90,17 +78,9 @@ public class HtmlToPdfService : IPdfService
throw new ArgumentException($"Cannot load language. ID={languageId}");
var html = await _viewRenderService.RenderToStringAsync(ShipmentsTemplate, shipments);
- try
- {
- TextReader sr = new StringReader(html);
- using var doc = Document.ParseDocument(sr, ParseSourceType.DynamicContent);
- doc.SaveAsPDF(stream);
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Error generating PDF from shipment HTML. HTML content: {Html}", html);
- throw;
- }
+ TextReader sr = new StringReader(html);
+ using var doc = Document.ParseDocument(sr, ParseSourceType.DynamicContent);
+ doc.SaveAsPDF(stream);
}
public async Task<string> SaveOrderToBinary(Order order, string languageId, string vendorId = "")
diff --git a/src/Web/Grand.Web.Common/ViewRender/ViewRenderService.cs b/src/Web/Grand.Web.Common/ViewRender/ViewRenderService.cs
index 765934196..cf9605427 100644
--- a/src/Web/Grand.Web.Common/ViewRender/ViewRenderService.cs
+++ b/src/Web/Grand.Web.Common/ViewRender/ViewRenderService.cs
@@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Mvc.Razor;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.Logging;
namespace Grand.Web.Common.ViewRender;
@@ -16,7 +15,6 @@ namespace Grand.Web.Common.ViewRender;
/// </summary>
public class ViewRenderService : IViewRenderService
{
- private readonly ILogger<ViewRenderService> _logger;
private readonly IRazorViewEngine _razorViewEngine;
private readonly IServiceProvider _serviceProvider;
private readonly ITempDataProvider _tempDataProvider;
@@ -24,13 +22,11 @@ public class ViewRenderService : IViewRenderService
public ViewRenderService(IRazorViewEngine razorViewEngine,
ITempDataProvider tempDataProvider,
- IServiceProvider serviceProvider,
- ILogger<ViewRenderService> logger)
+ IServiceProvider serviceProvider)
{
_razorViewEngine = razorViewEngine;
_tempDataProvider = tempDataProvider;
_serviceProvider = serviceProvider;
- _logger = logger;
}
@@ -57,18 +53,7 @@ public class ViewRenderService : IViewRenderService
new HtmlHelperOptions()
);
- try
- {
- await viewResult.View.RenderAsync(viewContext);
- }
- catch (Exception ex)
- {
- var partialHtmlLength = sw.GetStringBuilder().Length;
- _logger.LogError(ex, "Error rendering view '{ViewPath}'. Partial HTML length: {PartialHtmlLength}",
- viewPath, partialHtmlLength);
- throw;
- }
-
+ await viewResult.View.RenderAsync(viewContext);
return sw.ToString();
}
}
\ No newline at end of file