Merge branch 'develop' into task/RDMP-120-update-actions

HicServices · Jan 9, 2024 · 521acef · 521acef
2 parents 9fe4779 + a883242
commit 521acef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Reorder Process Task Enum order to restore old cached process tasks
 - Add quickstart instructions
 - Add ability to configure and use local file system storage in windows GUI
+- Truncate ProgressLog messages that would exceed database varchar limit
 
 ## [8.1.1] - 2023-12-01
 

diff --git a/Rdmp.Core/Logging/DataLoadInfo.cs b/Rdmp.Core/Logging/DataLoadInfo.cs
@@ -134,7 +134,7 @@ private void LogWorker()
                 using (var lockQuery = DatabaseSettings.GetCommand("SELECT TOP 1 * FROM ProgressLog WITH (HOLDLOCK, UPDLOCK, TABLOCKX) WHERE 1=0", con))
                     lockQuery.ExecuteNonQuery();
             using var cmdRecordProgress = DatabaseSettings.GetCommand(
-                "INSERT INTO ProgressLog (dataLoadRunID,eventType,source,description,time) VALUES (@dataLoadRunID,@eventType,@source,@description,@time);",
+                "INSERT INTO ProgressLog (dataLoadRunID,eventType,source,description,time) VALUES (@dataLoadRunID,LEFT(RTRIM(@eventType),50),LEFT(RTRIM(@source),100),LEFT(RTRIM(@description),8000),@time);",
                 con);
 
             DatabaseSettings.AddParameterWithValueToCommand("@dataLoadRunID", cmdRecordProgress, ID);