Merge pull request #36 from raisedapp/develop

Version 0.30

Author: felixclase

src/main/Hangfire.Storage.SQLite/ExpirationManager.cs

@@ -8,7 +8,7 @@
 namespace Hangfire.Storage.SQLite
 {
     /// <summary>
-    /// Represents Hangfire expiration manager for LiteDB database
+    /// Represents Hangfire expiration manager for SQLite database
     /// </summary>
 #pragma warning disable CS0618
     public class ExpirationManager : IBackgroundProcess, IServerComponent
@@ -44,7 +44,7 @@ public class ExpirationManager : IBackgroundProcess, IServerComponent
         /// <summary>
         /// Constructs expiration manager with one hour checking interval
         /// </summary>
-        /// <param name="storage">LiteDb storage</param>
+        /// <param name="storage">SQLite storage</param>
         public ExpirationManager(SQLiteStorage storage)
             : this(storage, TimeSpan.FromHours(1))
         {
@@ -53,7 +53,7 @@ public ExpirationManager(SQLiteStorage storage)
         /// <summary>
         /// Constructs expiration manager with specified checking interval
         /// </summary>
-        /// <param name="storage">LiteDB storage</param>
+        /// <param name="storage">SQLite storage</param>
         /// <param name="checkInterval">Checking interval</param>
         public ExpirationManager(SQLiteStorage storage, TimeSpan checkInterval)
         {

src/main/Hangfire.Storage.SQLite/Hangfire.Storage.SQLite.csproj

@@ -7,7 +7,7 @@
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
-    <Version>0.2.6</Version>
+    <Version>0.3.0</Version>
     <Authors>RaisedApp</Authors>
     <Company>RaisedApp</Company>
     <Copyright>Copyright © 2019 - Present</Copyright>
@@ -20,7 +20,7 @@
     <title>Hangfire Storage SQLite</title>    
     <Description>An Alternative SQLite Storage for Hangfire</Description>
     <PackageReleaseNotes>
-      0.2.6
+      0.3.0
       - Fix DistributedLockTimeoutException with Hangfire.Storage.SQLite
     </PackageReleaseNotes>
   </PropertyGroup>

src/main/Hangfire.Storage.SQLite/HangfireDbContext.cs

@@ -35,7 +35,7 @@ public class HangfireDbContext
 
 
         /// <summary>
-        /// Starts LiteDB database using a connection string for file system database
+        /// Starts SQLite database using a connection string for file system database
         /// </summary>
         /// <param name="databasePath">the database path</param>
         /// <param name="prefix">Table prefix</param>

src/main/Hangfire.Storage.SQLite/SQLiteDistributedLock.cs

@@ -70,7 +70,7 @@ public SQLiteDistributedLock(string resource, TimeSpan timeout, HangfireDbContex
         /// <summary>
         /// Disposes the object
         /// </summary>
-        /// <exception cref="LiteDbDistributedLockException"></exception>
+        /// <exception cref="DistributedLockTimeoutException"></exception>
         public void Dispose()
         {
             if (_completed)
@@ -117,26 +117,31 @@ private void Acquire(TimeSpan timeout)
 
                 while (!isLockAcquired && (lockTimeoutTime >= now))
                 {
-                    var result = _dbContext.DistributedLockRepository.FirstOrDefault(_ => _.Resource == _resource);
-                    var distributedLock = result ?? new DistributedLock();
+                    DistributedLock result;
 
-                    if (string.IsNullOrWhiteSpace(distributedLock.Id))
-                        distributedLock.Id = Guid.NewGuid().ToString();
+                    lock (EventWaitHandleName)
+                    {
+                        result = _dbContext.DistributedLockRepository.FirstOrDefault(_ => _.Resource == _resource);
+                        var distributedLock = result ?? new DistributedLock();
 
-                    distributedLock.Resource = _resource;
-                    distributedLock.ExpireAt = DateTime.UtcNow.Add(_storageOptions.DistributedLockLifetime);
+                        if (string.IsNullOrWhiteSpace(distributedLock.Id))
+                            distributedLock.Id = Guid.NewGuid().ToString();
 
-                    var rowsAffected = _dbContext.Database.Update(distributedLock);
-                    if (rowsAffected == 0)
-                    {
-                        try
-                        {
-                            _dbContext.Database.Insert(distributedLock);
-                        }
-                        catch(SQLiteException e) when (e.Result == SQLite3.Result.Constraint)
+                        distributedLock.Resource = _resource;
+                        distributedLock.ExpireAt = DateTime.UtcNow.Add(_storageOptions.DistributedLockLifetime);
+
+                        var rowsAffected = _dbContext.Database.Update(distributedLock);
+                        if (rowsAffected == 0)
                         {
-                            // The lock already exists preventing us from inserting.
-                            continue;
+                            try
+                            {
+                                _dbContext.Database.Insert(distributedLock);
+                            }
+                            catch (SQLiteException e) when (e.Result == SQLite3.Result.Constraint)
+                            {
+                                // The lock already exists preventing us from inserting.
+                                continue;
+                            }
                         }
                     }
 

src/samples/ConsoleSample/Program.cs

@@ -10,7 +10,7 @@ public static void Main(string[] args)
         {
             try
             {
-                // you can use LiteDB Storage and specify the connection string name
+                // you can use SQLite Storage and specify the connection string name
                 GlobalConfiguration.Configuration
                     .UseColouredConsoleLogProvider()
                     .UseSQLiteStorage();
@@ -28,7 +28,7 @@ public static void Main(string[] args)
             }
             catch (Exception ex)
             {
-                Console.WriteLine($"Error in execution. Detail: {ex.ToString()}");
+                Console.WriteLine($"Error in execution. Detail: {ex}");
             }
 
             Console.ReadLine();