Merge pull request #18 from raisedapp/develop

Version 0.2.3
raisedapp · Jan 15, 2020 · dd64c51 · dd64c51
2 parents aa64e24 + a917882
commit dd64c51
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/main/Hangfire.Storage.SQLite/Hangfire.Storage.SQLite.csproj b/src/main/Hangfire.Storage.SQLite/Hangfire.Storage.SQLite.csproj
@@ -7,7 +7,7 @@
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
-    <Version>0.2.2</Version>
+    <Version>0.2.3</Version>
     <Authors>RaisedApp</Authors>
     <Company>RaisedApp</Company>
     <Copyright>Copyright © 2019 - Present</Copyright>
@@ -20,10 +20,9 @@
     <title>Hangfire Storage SQLite</title>    
     <Description>An Alternative SQLite Storage for Hangfire</Description>
     <PackageReleaseNotes>
-      0.2.2
-      - Add AutoVacuum Options
-      - Add ExpireAt In JobParamter And State Models
-      - Fix pragma sql
+      0.2.3
+      - Avoid exception The given key 'X' was not present in the dictionary
+      - Fix Difference State between State Table and Job Table
     </PackageReleaseNotes>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/main/Hangfire.Storage.SQLite/SQLiteMonitoringApi.cs b/src/main/Hangfire.Storage.SQLite/SQLiteMonitoringApi.cs
@@ -152,7 +152,7 @@ private JobList<EnqueuedJobDto> EnqueuedJobs(HangfireDbContext connection, IEnum
                     Job = job,
                     State = sqlJob.StateName,
                     EnqueuedAt = sqlJob.StateName == EnqueuedState.StateName
-                        ? JobHelper.DeserializeNullableDateTime(stateData["EnqueuedAt"])
+                        ? JobHelper.DeserializeNullableDateTime(stateData.ContainsKey("EnqueuedAt") ? stateData["EnqueuedAt"] : string.Empty)
                         : null
                 });
         }
@@ -283,7 +283,7 @@ public JobList<DeletedJobDto> DeletedJobs(int from, int count)
                 (sqlJob, job, stateData) => new DeletedJobDto
                 {
                     Job = job,
-                    DeletedAt = JobHelper.DeserializeNullableDateTime(stateData["DeletedAt"])
+                    DeletedAt = JobHelper.DeserializeNullableDateTime(stateData.ContainsKey("DeletedAt") ? stateData["DeletedAt"] : string.Empty)
                 }));
         }
 
@@ -360,7 +360,7 @@ public JobList<FailedJobDto> FailedJobs(int from, int count)
                     ExceptionDetails = stateData["ExceptionDetails"],
                     ExceptionMessage = stateData["ExceptionMessage"],
                     ExceptionType = stateData["ExceptionType"],
-                    FailedAt = JobHelper.DeserializeNullableDateTime(stateData["FailedAt"])
+                    FailedAt = JobHelper.DeserializeNullableDateTime(stateData.ContainsKey("FailedAt") ? stateData["FailedAt"] : string.Empty)
                 }));          
         }
 
@@ -621,7 +621,7 @@ public JobList<SucceededJobDto> SucceededJobs(int from, int count)
                     TotalDuration = stateData.ContainsKey("PerformanceDuration") && stateData.ContainsKey("Latency")
                         ? (long?)long.Parse(stateData["PerformanceDuration"]) + (long?)long.Parse(stateData["Latency"])
                         : null,
-                    SucceededAt = JobHelper.DeserializeNullableDateTime(stateData["SucceededAt"])
+                    SucceededAt = JobHelper.DeserializeNullableDateTime(stateData.ContainsKey("SucceededAt") ? stateData["SucceededAt"] : string.Empty)
                 }));        
         }
         /// <summary>

diff --git a/src/main/Hangfire.Storage.SQLite/SQLiteWriteOnlyTransaction.cs b/src/main/Hangfire.Storage.SQLite/SQLiteWriteOnlyTransaction.cs
@@ -307,6 +307,8 @@ public override void SetJobState(string jobId, IState state)
                 {
                     job.StateName = state.Name;
 
+                    _.Database.BeginTransaction();
+
                     _.Database.Insert(new State
                     {
                         JobId = iJobId,
@@ -315,8 +317,9 @@ public override void SetJobState(string jobId, IState state)
                         CreatedAt = DateTime.UtcNow,
                         Data = JsonConvert.SerializeObject(state.SerializeData())
                     });
-                    
                     _.Database.Update(job);
+
+                    _.Database.Commit();
                 }
             });        
         }