From dbeec956fc8fe52d3b1aac146aa6ab836aef2c14 Mon Sep 17 00:00:00 2001 From: Krzysztof Pajak Date: Wed, 29 Apr 2026 21:14:23 +0200 Subject: [PATCH] Revert "Add detailed error logging for HTML/PDF generation failures (#684)" This reverts commit 2f0c2da4242e81003991ec91fbda3d663dfcc38d. --- .../Services/Pdf/HtmlToPdfService.cs | 34 ++++--------------- .../ViewRender/ViewRenderService.cs | 19 ++--------- 2 files changed, 9 insertions(+), 44 deletions(-) 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.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 _downloadRepository; private readonly ILanguageService _languageService; - private readonly ILogger _logger; private readonly IStoreFilesContext _storeFilesContext; private readonly IViewRenderService _viewRenderService; private readonly IWebHostEnvironment _webHostEnvironment; public HtmlToPdfService(IViewRenderService viewRenderService, IRepository downloadRepository, - ILanguageService languageService, IStoreFilesContext storeFilesContext, IWebHostEnvironment webHostEnvironment, - ILogger 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 orders, string languageId = "", @@ -47,17 +43,9 @@ public async Task PrintOrdersToPdf(Stream stream, IList orders, string la var html = await _viewRenderService.RenderToStringAsync(OrderTemplate, new ValueTuple, 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 PrintOrderToPdf(Order order, string languageId, string vendorId = "") @@ -90,17 +78,9 @@ public async Task PrintPackagingSlipsToPdf(Stream stream, IList shipme 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 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.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; /// public class ViewRenderService : IViewRenderService { - private readonly ILogger _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 logger) + IServiceProvider serviceProvider) { _razorViewEngine = razorViewEngine; _tempDataProvider = tempDataProvider; _serviceProvider = serviceProvider; - _logger = logger; } @@ -57,18 +53,7 @@ public async Task RenderToStringAsync(string viewPath, TModel mo 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