Only test connection on first iteration

NuGet · Oct 30, 2018 · 20785fa · 20785fa
1 parent dd6949b
commit 20785fa
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/src/NuGet.Jobs.Common/JsonConfigurationJob.cs b/src/NuGet.Jobs.Common/JsonConfigurationJob.cs
@@ -31,6 +31,8 @@ public abstract class JsonConfigurationJob : JobBase
         private const string ServiceBusConfigurationSectionName = "ServiceBus";
         private const string ValidationStorageConfigurationSectionName = "ValidationStorage";
 
+        private bool testDatabaseConnections = true;
+
         public JsonConfigurationJob()
             : this(null)
         {
@@ -147,19 +149,26 @@ private void ConfigureLibraries(IServiceCollection services)
 
         protected virtual void RegisterDatabases(IServiceProvider serviceProvider)
         {
-            RegisterDatabaseIfConfigured<GalleryDbConfiguration>(serviceProvider);
-            RegisterDatabaseIfConfigured<StatisticsDbConfiguration>(serviceProvider);
-            RegisterDatabaseIfConfigured<SupportRequestDbConfiguration>(serviceProvider);
-            RegisterDatabaseIfConfigured<ValidationDbConfiguration>(serviceProvider);
+            try
+            {
+                RegisterDatabaseIfConfigured<GalleryDbConfiguration>(serviceProvider, testDatabaseConnections);
+                RegisterDatabaseIfConfigured<StatisticsDbConfiguration>(serviceProvider, testDatabaseConnections);
+                RegisterDatabaseIfConfigured<SupportRequestDbConfiguration>(serviceProvider, testDatabaseConnections);
+                RegisterDatabaseIfConfigured<ValidationDbConfiguration>(serviceProvider, testDatabaseConnections);
+            }
+            finally
+            {
+                testDatabaseConnections = false;
+            }
         }
 
-        private void RegisterDatabaseIfConfigured<TDbConfiguration>(IServiceProvider serviceProvider)
+        private void RegisterDatabaseIfConfigured<TDbConfiguration>(IServiceProvider serviceProvider, bool testConnection)
             where TDbConfiguration : IDbConfiguration
         {
             var dbConfiguration = serviceProvider.GetRequiredService<IOptionsSnapshot<TDbConfiguration>>();
             if (!string.IsNullOrEmpty(dbConfiguration.Value?.ConnectionString))
             {
-                RegisterDatabase<TDbConfiguration>(serviceProvider);
+                RegisterDatabase<TDbConfiguration>(serviceProvider, testConnection);
             }
         }