From 2af4102b65ebff7ef0e80faa2172277bbde018a7 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Thu, 11 Apr 2024 10:19:57 -0500 Subject: [PATCH] add log in agent refresh --- .../Services/AgentService.RefreshAgents.cs | 4 +++- .../Services/AgentService.UpdateAgent.cs | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs index 3077e9294..356707a87 100644 --- a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs +++ b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs @@ -51,10 +51,12 @@ public async Task RefreshAgents() var isAgentDeleted = _db.DeleteAgent(agent.Id); if (isAgentDeleted) { + await Task.Delay(100); _db.BulkInsertAgents(new List { agent }); _db.BulkInsertUserAgents(new List { userAgent }); _db.BulkInsertAgentTasks(tasks); refreshedAgents.Add(agent.Name); + _logger.LogInformation($"Agent {agent.Name} has been migrated."); } } catch (Exception ex) @@ -66,7 +68,7 @@ public async Task RefreshAgents() if (!refreshedAgents.IsNullOrEmpty()) { Utilities.ClearCache(); - refreshResult = $"Agents are migrated! {string.Join("\r\n", refreshedAgents)}"; + refreshResult = $"Agents are migrated!\r\n{string.Join("\r\n", refreshedAgents)}"; } else { diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs index 5eca3f8c6..747bd11cd 100644 --- a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs +++ b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs @@ -41,10 +41,13 @@ public async Task UpdateAgent(Agent agent, AgentField updateField) public async Task UpdateAgentFromFile(string id) { + string updateResult; var agent = _db.GetAgent(id); if (agent == null) { - return $"Cannot find agent ${id}"; + updateResult = $"Cannot find agent ${id}"; + _logger.LogError(updateResult); + return updateResult; } var dbSettings = _services.GetRequiredService(); @@ -57,7 +60,9 @@ public async Task UpdateAgentFromFile(string id) var foundAgent = FetchAgentFileById(agent.Id, filePath); if (foundAgent == null) { - return $"Cannot find agent {agent.Name} in file directory: {filePath}"; + updateResult = $"Cannot find agent {agent.Name} in file directory: {filePath}"; + _logger.LogError(updateResult); + return updateResult; } try @@ -79,11 +84,16 @@ public async Task UpdateAgentFromFile(string id) _db.UpdateAgent(clonedAgent, AgentField.All); Utilities.ClearCache(); - return $"Agent {agent.Name} has been migrated!"; + + updateResult = $"Agent {agent.Name} has been migrated!"; + _logger.LogInformation(updateResult); + return updateResult; } catch (Exception ex) { - return $"Failed to migrate agent {agent.Name} in file directory {filePath}.\r\nError: {ex.Message}"; + updateResult = $"Failed to migrate agent {agent.Name} in file directory {filePath}.\r\nError: {ex.Message}"; + _logger.LogError(updateResult); + return updateResult; } }