Changes to fix the connection issues for both Non-SSL and SSL encrypted databases (#124 and #127) (#129)

* Changes to fix the connection issues (#124 and #127)

* Changes to fix connection issues with SSL encrypted databases (#124 and #127)

Author: VincentVrijburg

src/Hangfire.PostgreSql/PostgreSqlMonitoringApi.cs

@@ -36,16 +36,19 @@ namespace Hangfire.PostgreSql
 {
     public class PostgreSqlMonitoringApi : IMonitoringApi
     {
-        private readonly NpgsqlConnection _connection;
+        private readonly string _connectionString;
+        private readonly Action<NpgsqlConnection> _connectionSetup;
         private readonly PostgreSqlStorageOptions _options;
         private readonly PersistentJobQueueProviderCollection _queueProviders;
 
         public PostgreSqlMonitoringApi(
-            NpgsqlConnection connection,
+            string connectionString,
+            Action<NpgsqlConnection> connectionSetup,
             PostgreSqlStorageOptions options,
             PersistentJobQueueProviderCollection queueProviders)
         {
-            _connection = connection ?? throw new ArgumentNullException(nameof(connection));
+            _connectionString = connectionString ?? throw new ArgumentNullException(nameof(connectionString));
+            _connectionSetup = connectionSetup;
             _options = options ?? throw new ArgumentNullException(nameof(options));
             _queueProviders = queueProviders ?? throw new ArgumentNullException(nameof(queueProviders));
         }
@@ -387,7 +390,12 @@ SELECT COUNT(*)
             });
         }
 
-        protected virtual NpgsqlConnection GetConnection() => _connection;
+        protected virtual NpgsqlConnection GetConnection()
+        {
+            var connection = new NpgsqlConnection(_connectionString);
+            _connectionSetup?.Invoke(connection);
+            return connection;
+        }
 
         private Dictionary<DateTime, long> GetHourlyTimelineStats(
             NpgsqlConnection connection,
@@ -466,7 +474,11 @@ private IPersistentJobQueueMonitoringApi GetQueueApi(
 
         private T UseConnection<T>(Func<NpgsqlConnection, T> action)
         {
-            return action(GetConnection());
+            using (var connection = GetConnection())
+            {
+                connection.Open();
+                return action(connection);
+            }
         }
 
         private JobList<EnqueuedJobDto> EnqueuedJobs(NpgsqlConnection connection, IEnumerable<long> jobIds)

src/Hangfire.PostgreSql/PostgreSqlStorage.cs

@@ -41,7 +41,7 @@ public class PostgreSqlStorage : JobStorage
         private readonly string _connectionString;
 
         public PostgreSqlStorage(string nameOrConnectionString)
-            : this(nameOrConnectionString, null, new PostgreSqlStorageOptions())
+            : this(nameOrConnectionString, new PostgreSqlStorageOptions())
         {
         }
 
@@ -139,16 +139,12 @@ public PostgreSqlStorage(NpgsqlConnection existingConnection)
 
         public override IMonitoringApi GetMonitoringApi()
         {
-            var connection = _existingConnection ?? CreateAndOpenConnection();
-            _connectionSetup?.Invoke(connection);
-
-            return new PostgreSqlMonitoringApi(connection, _options, QueueProviders);
+            return new PostgreSqlMonitoringApi(_connectionString, _connectionSetup, _options, QueueProviders);
         }
 
         public override IStorageConnection GetConnection()
         {
             var connection = _existingConnection ?? CreateAndOpenConnection();
-            _connectionSetup?.Invoke(connection);
 
             return new PostgreSqlConnection(connection, QueueProviders, _options, _existingConnection == null);
         }
@@ -199,6 +195,8 @@ internal NpgsqlConnection CreateAndOpenConnection()
             };
 
             var connection = new NpgsqlConnection(connectionStringBuilder.ToString());
+
+            _connectionSetup?.Invoke(connection);
             connection.Open();
 
             return connection;

tests/Hangfire.PostgreSql.Tests/Hangfire.PostgreSql.Tests.csproj

@@ -17,16 +17,6 @@
     <EmbeddedResource Include="*.sql" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Remove="Certificates\**" />
-    <EmbeddedResource Remove="Certificates\**" />
-    <None Remove="Certificates\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="Scripts\Clean.sql" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="Scripts\Clean.sql" />
   </ItemGroup>

tests/Hangfire.PostgreSql.Tests/PostgreSqlMonitoringApiFacts.cs

@@ -31,7 +31,7 @@ public PostgreSqlMonitoringApiFacts()
                 SchemaName = ConnectionUtils.GetSchemaName()
             };
 
-            _storage = new PostgreSqlStorage(ConnectionUtils.CreateConnection(), _options);
+            _storage = new PostgreSqlStorage(ConnectionUtils.GetConnectionString(), _options);
         }
 
         [Fact, CleanDatabase]

tests/Hangfire.PostgreSql.Tests/Utils/ConnectionUtils.cs

@@ -14,9 +14,9 @@ public static class ConnectionUtils
 		private const string DefaultDatabaseName = @"hangfire_tests";
 		private const string DefaultSchemaName = @"hangfire";
 
-		private const string DefaultConnectionStringTemplate = @"Server=127.0.0.1;Port=5432;Database=postgres;User Id=postgres;Password=password;";
+	    private const string DefaultConnectionStringTemplate = @"Server=127.0.0.1;Port=5432;Database=postgres;User Id=postgres;Password=password;";
 
-		public static string GetDatabaseName()
+        public static string GetDatabaseName()
 		{
 			return Environment.GetEnvironmentVariable(DatabaseVariable) ?? DefaultDatabaseName;
 		}