Log response

SeriaWei · Mar 19, 2023 · e95aefe · e95aefe
1 parent 017e6f7
commit e95aefe
Show file tree

Hide file tree

Showing 18 changed files with 51 additions and 26 deletions.
diff --git a/Database/MySql/Dump.sql b/Database/MySql/Dump.sql
@@ -1494,7 +1494,7 @@ INSERT INTO `EA_EventAction` VALUES
 DROP TABLE IF EXISTS `EA_PendingTask`;
 CREATE TABLE `EA_PendingTask` (
 	`ID` INT AUTO_INCREMENT  NOT NULL,
-	`Identifier` VARCHAR(100) CHARACTER SET utf8mb4  NOT NULL,
+	`Identifier` VARCHAR(200) CHARACTER SET utf8mb4  NOT NULL,
 	`HandlerName` VARCHAR(100) CHARACTER SET utf8mb4  NOT NULL,
 	`Data` LONGTEXT CHARACTER SET utf8mb4  NULL,
 	`LogMessage` LONGTEXT CHARACTER SET utf8mb4  NULL,

diff --git a/Database/SQLite/ZKEACMS.sqlite.sql b/Database/SQLite/ZKEACMS.sqlite.sql
@@ -503,7 +503,7 @@ CREATE TABLE [ExtendField] (
 );
 CREATE TABLE [EA_PendingTask] (
   [ID] INTEGER NOT NULL
-, [Identifier] nvarchar(100) NOT NULL
+, [Identifier] nvarchar(200) NOT NULL
 , [HandlerName] nvarchar(100) NOT NULL
 , [Data] ntext NULL
 , [LogMessage] ntext NULL

diff --git a/Database/Update/3.7/MsSql.sql b/Database/Update/3.7/MsSql.sql
@@ -52,7 +52,7 @@ SET QUOTED_IDENTIFIER ON
 GO
 CREATE TABLE [dbo].[EA_PendingTask](
 	[ID] [int] IDENTITY(1,1) NOT NULL,
-	[Identifier] [nvarchar](100) NOT NULL,
+	[Identifier] [nvarchar](200) NOT NULL,
 	[HandlerName] [nvarchar](100) NOT NULL,
 	[Data] [nvarchar](max) NULL,
 	[LogMessage] [nvarchar](max) NULL,

diff --git a/Database/Update/3.7/MySql.sql b/Database/Update/3.7/MySql.sql
@@ -151,7 +151,7 @@ INSERT INTO `EA_EventAction` VALUES
 DROP TABLE IF EXISTS `EA_PendingTask`;
 CREATE TABLE `EA_PendingTask` (
 	`ID` INT AUTO_INCREMENT  NOT NULL,
-	`Identifier` VARCHAR(100) CHARACTER SET utf8mb4  NOT NULL,
+	`Identifier` VARCHAR(200) CHARACTER SET utf8mb4  NOT NULL,
 	`HandlerName` VARCHAR(100) CHARACTER SET utf8mb4  NOT NULL,
 	`Data` LONGTEXT CHARACTER SET utf8mb4  NULL,
 	`LogMessage` LONGTEXT CHARACTER SET utf8mb4  NULL,

diff --git a/Database/Update/3.7/Sqlite.sql b/Database/Update/3.7/Sqlite.sql
@@ -1,6 +1,6 @@
 CREATE TABLE [EA_PendingTask] (
   [ID] INTEGER NOT NULL
-, [Identifier] nvarchar(100) NOT NULL
+, [Identifier] nvarchar(200) NOT NULL
 , [HandlerName] nvarchar(100) NOT NULL
 , [Data] ntext NULL
 , [LogMessage] ntext NULL

diff --git a/Database/Update/3.7/package.zip b/Database/Update/3.7/package.zip
diff --git a/Database/script.sql b/Database/script.sql
@@ -700,7 +700,7 @@ SET QUOTED_IDENTIFIER ON
 GO
 CREATE TABLE [dbo].[EA_PendingTask](
 	[ID] [int] IDENTITY(1,1) NOT NULL,
-	[Identifier] [nvarchar](100) NOT NULL,
+	[Identifier] [nvarchar](200) NOT NULL,
 	[HandlerName] [nvarchar](100) NOT NULL,
 	[Data] [nvarchar](max) NULL,
 	[LogMessage] [nvarchar](max) NULL,

diff --git a/...ventAction/ActionExecutor/EventHandler.cs → ...ActionExecutor/EventActionEventHandler.cs b/...ventAction/ActionExecutor/EventHandler.cs → ...ActionExecutor/EventActionEventHandler.cs
@@ -13,20 +13,23 @@
 using ZKEACMS.Event;
 using ZKEACMS.EventAction.Service;
 using Easy.RuleEngine;
+using Microsoft.Extensions.Logging;
 
 namespace ZKEACMS.EventAction.ActionExecutor
 {
-    public sealed class EventHandler : IEventHandler
+    public sealed class EventActionEventHandler : IEventHandler
     {
         private readonly IEventActionService _eventActionService;
         private readonly IExecutorManager _executorManager;
-        private readonly IRuleManager _ruleManager;
+        private readonly ILogger<EventActionEventHandler> _logger;
 
-        public EventHandler(IEventActionService eventActionService, IExecutorManager executorManager, IRuleManager ruleManager)
+        public EventActionEventHandler(IEventActionService eventActionService, 
+            IExecutorManager executorManager, 
+            ILogger<EventActionEventHandler> logger)
         {
             _eventActionService = eventActionService;
             _executorManager = executorManager;
-            _ruleManager = ruleManager;
+            _logger = logger;
         }
 
         public void Handle(object entity, EventArg e)
@@ -45,7 +48,14 @@ public void Handle(object entity, EventArg e)
                     var executor = _executorManager.CreateExecutor(parsedAction.Uses);
                     if (executor == null) continue;
 
-                    executor.Execute(new Arguments(parsedAction.GetRendedWith(entity)), entity, e);
+                    try
+                    {
+                        executor.Execute(new Arguments(parsedAction.GetRendedWith(entity)), entity, e);
+                    }
+                    catch(Exception ex)
+                    {
+                        _logger.LogError(ex, ex.Message);
+                    }
                 }
             }
         }

diff --git a/src/ZKEACMS.EventAction/ActionExecutor/Executors/HttpExecutor.cs b/src/ZKEACMS.EventAction/ActionExecutor/Executors/HttpExecutor.cs
@@ -44,7 +44,7 @@ public ServiceResult Execute(Arguments args, object model, EventArg e)
         }
         private void PushRequestInQueue(HttpRequestContent httpRequest)
         {
-            _pendingTaskService.Add(httpRequest.Url, HttpRequesetTaskHandler.Name, httpRequest);
+            _pendingTaskService.Add(httpRequest.Method + " " + httpRequest.Url.Split('?')[0], HttpRequesetTaskHandler.Name, httpRequest);
         }
     }
 }
diff --git a/src/ZKEACMS.EventAction/EventActionPlug.cs b/src/ZKEACMS.EventAction/EventActionPlug.cs
@@ -101,7 +101,7 @@ public override void ConfigureServices(IServiceCollection serviceCollection)
             serviceCollection.AddTransient<IActionBodyService, ActionBodyService>();
             serviceCollection.ConfigureMetaData<Models.ActionBody, Models.ActionBodyMetaData>();
 
-            serviceCollection.RegistEvent<ActionExecutor.EventHandler>(Event.Events.All);
+            serviceCollection.RegistEvent<ActionExecutor.EventActionEventHandler>(Event.Events.All);
             serviceCollection.RegistPendingTask<HttpRequesetTaskHandler>(HttpRequesetTaskHandler.Name);
 
             serviceCollection.AddScoped<IExecutorManager, ExecutorManager>();

diff --git a/src/ZKEACMS.EventAction/HttpParser/HttpRequesetTaskHandler.cs b/src/ZKEACMS.EventAction/HttpParser/HttpRequesetTaskHandler.cs
@@ -2,6 +2,7 @@
  * Copyright (c) ZKEASOFT. All rights reserved. 
  * http://www.zkea.net/licenses */
 
+using Easy.RepositoryPattern;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -23,19 +24,19 @@ public HttpRequesetTaskHandler(IHttpClientFactory httpClientFactory)
             _httpClientFactory = httpClientFactory;
         }
 
-        public override async Task ExecuteAsync(object context)
+        public override Task<ServiceResult<string>> ExecuteAsync(object context)
         {
-            await SendAsync(context as HttpRequestContent);
+            return SendAsync(context as HttpRequestContent);
         }
 
-        public async Task SendAsync(HttpRequestContent httpRequest)
+        public async Task<ServiceResult<string>> SendAsync(HttpRequestContent httpRequest)
         {
             using (var response = await _httpClientFactory.CreateClient().SendAsync(httpRequest.ConvertToHttpRequestMessage()))
             {
                 string responseContent = await response.Content.ReadAsStringAsync();
-                if (response.IsSuccessStatusCode) return;
+                if (!response.IsSuccessStatusCode) throw new Exception($"Send http request with error.\r\nPayload:\r\n{httpRequest}\r\nResponse:\r\n{responseContent}");
 
-                throw new Exception($"Send http request with error.\r\nPayload:\r\n{httpRequest}\r\nResponse:\r\n{responseContent}");
+                return new ServiceResult<string>(responseContent);
             }
         }
     }

diff --git a/src/ZKEACMS.EventAction/Service/PendingTaskService.cs b/src/ZKEACMS.EventAction/Service/PendingTaskService.cs
@@ -47,8 +47,13 @@ public void Add(string identifier, string handlerName, object context)
                 HandlerName = handlerName,
                 Data = JsonConverter.Serialize(context),
                 Status = (int)PendingTaskStatus.Pending,
-                CreateDate = DateTime.Now
+                CreateDate = DateTime.Now,
+                LastUpdateDate = DateTime.Now
             };
+            if (newTask.Identifier.Length > 200)
+            {
+                newTask.Identifier = newTask.Identifier.Substring(0, 200);
+            }
             _dbContextProvider.Current.Set<PendingTaskEntity>().Add(newTask);
             _dbContextProvider.Current.SaveChanges();
         }

diff --git a/src/ZKEACMS.EventAction/Views/PendingTask/Index.cshtml b/src/ZKEACMS.EventAction/Views/PendingTask/Index.cshtml
@@ -13,7 +13,9 @@
     @Html.SearchTerms(Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManagePendingTask))
     <div class="panel panel-default">
         <div class="panel-body">
-            <grid delete-able="Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManagePendingTask)" edit-able="Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManagePendingTask)"></grid>
+            <grid delete-able="Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManagePendingTask)"
+                  edit-able="Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManagePendingTask)" 
+                  order-desc="CreateDate"></grid>
         </div>
     </div>    
 </div>
diff --git a/src/ZKEACMS.Mail/EmailPendingTaskHandler.cs b/src/ZKEACMS.Mail/EmailPendingTaskHandler.cs
@@ -1,4 +1,5 @@
 using Easy.Notification;
+using Easy.RepositoryPattern;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -18,9 +19,10 @@ public EmailPendingTaskHandler(IEmailNotification emailNotification)
             _emailNotification = emailNotification;
         }
 
-        public override Task ExecuteAsync(object context)
+        public override async Task<ServiceResult<string>> ExecuteAsync(object context)
         {
-            return _emailNotification.SendEmailAsync(context as EmailContext);
+            await _emailNotification.SendEmailAsync(context as EmailContext);
+            return new ServiceResult<string>();
         }
     }
 }
diff --git a/src/ZKEACMS.Mail/Queue/PersistentEmailQueue.cs b/src/ZKEACMS.Mail/Queue/PersistentEmailQueue.cs
@@ -28,7 +28,7 @@ public Task<EmailContext> Receive(CancellationToken cancellationToken = default)
 
         public Task Send(EmailContext emailMessage)
         {
-            _pendingTaskService.Add(string.Join(";", emailMessage.EmailMessage.To), EmailPendingTaskHandler.Name, emailMessage);
+            _pendingTaskService.Add("mailto: " + string.Join(";", emailMessage.EmailMessage.To), EmailPendingTaskHandler.Name, emailMessage);
             return Task.CompletedTask;
         }
     }

diff --git a/src/ZKEACMS/PendingTask/IPendingTaskHandler.cs b/src/ZKEACMS/PendingTask/IPendingTaskHandler.cs
@@ -2,6 +2,7 @@
  * Copyright (c) ZKEASOFT. All rights reserved. 
  * http://www.zkea.net/licenses */
 
+using Easy.RepositoryPattern;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,7 +13,7 @@ namespace ZKEACMS.PendingTask
 {
     public interface IPendingTaskHandler<out T>
     {
-        Task ExecuteAsync(object context);
+        Task<ServiceResult<string>> ExecuteAsync(object context);
         T Deserialize(string rowData);
     }
 }
diff --git a/src/ZKEACMS/PendingTask/PendingTaskExecutor.cs b/src/ZKEACMS/PendingTask/PendingTaskExecutor.cs
@@ -45,7 +45,10 @@ public async Task ProcessAllPendingTaskAsync()
                 try
                 {
                     var context = taskHandler.Deserialize(task.Data);
-                    await taskHandler.ExecuteAsync(context);
+                    var result = await taskHandler.ExecuteAsync(context);
+                    if (result.HasViolation) throw new Exception(result.ErrorMessage);
+
+                    task.LogMessage = result.Result;
                     _pendingTaskService.Complete(task);
                 }
                 catch (Exception ex)

diff --git a/src/ZKEACMS/PendingTask/PendingTaskHandler.cs b/src/ZKEACMS/PendingTask/PendingTaskHandler.cs
@@ -2,6 +2,7 @@
  * Copyright (c) ZKEASOFT. All rights reserved. 
  * http://www.zkea.net/licenses */
 
+using Easy.RepositoryPattern;
 using Easy.Serializer;
 using System;
 using System.Collections.Generic;
@@ -18,6 +19,6 @@ public T Deserialize(string rowData)
             return JsonConverter.Deserialize<T>(rowData);
         }
 
-        public abstract Task ExecuteAsync(object context);
+        public abstract Task<ServiceResult<string>> ExecuteAsync(object context);
     }
 }