Fixed talking to the database too early (again, but better this time).

Author: JakeGinnivan

src/FunnelWeb.Web/Global.asax.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Reflection;
 using System.Web;
 using System.Web.Hosting;
@@ -35,7 +36,8 @@ public class MvcApplication : HttpApplication
         public static void BeforeApplicationStart()
         {
             extensionsPath = HostingEnvironment.MapPath("~/bin/Extensions") ?? string.Empty;
-            Extensibility.EnableAspNetIntegration(extensionsPath);
+            if (Directory.Exists(extensionsPath))
+                Extensibility.EnableAspNetIntegration(extensionsPath);
         }
 
         private static IContainer BuildContainer()

src/FunnelWeb/Settings/SettingsModule.cs

@@ -1,4 +1,5 @@
-using Autofac;
+using System;
+using Autofac;
 using FunnelWeb.DatabaseDeployer;
 using FunnelWeb.Model.Repositories;
 
@@ -29,7 +30,7 @@ protected override void Load(ContainerBuilder builder)
                 .As<IAppHarborSettings>()
                 .SingleInstance();
 
-            builder.Register(c => new SettingsProvider(c.Resolve<IAdminRepository>()))
+            builder.Register(c => new SettingsProvider(c.Resolve<Lazy<IAdminRepository>>()))
                 .As<ISettingsProvider>()
                 .InstancePerLifetimeScope();
         }

src/FunnelWeb/Settings/SettingsProvider.cs

@@ -11,10 +11,10 @@ namespace FunnelWeb.Settings
     public class SettingsProvider : ISettingsProvider
     {
         private readonly object @lock = new object();
-        private readonly IAdminRepository repository;
+        private readonly Lazy<IAdminRepository> repository;
         private readonly Dictionary<Type, ISettings> settingsStore = new Dictionary<Type, ISettings>();
 
-        public SettingsProvider(IAdminRepository repository)
+        public SettingsProvider(Lazy<IAdminRepository> repository)
         {
             this.repository = repository;
         }
@@ -56,7 +56,7 @@ private void LoadSettings<T>() where T : ISettings
             var settings = Activator.CreateInstance<T>();
             settingsStore.Add(typeof(T), settings);
             var settingMetadata = ReadSettingMetadata<T>();
-            var databaseSettings = repository.GetSettings().ToList();
+            var databaseSettings = repository.Value.GetSettings().ToList();
 
             foreach (var setting in settingMetadata)
             {
@@ -88,7 +88,7 @@ public void SaveSettings<T>(T settingsToSave) where T : ISettings
                 settingsStore.Add(settingsType, settingsToSave);
 
             var settingsMetadata = ReadSettingMetadata<T>();
-            var databaseSettings = repository.GetSettings().ToList();
+            var databaseSettings = repository.Value.GetSettings().ToList();
 
             foreach (var setting in settingsMetadata)
             {
@@ -118,7 +118,7 @@ public void SaveSettings<T>(T settingsToSave) where T : ISettings
                 }
             }
 
-            repository.Save(databaseSettings);
+            repository.Value.Save(databaseSettings);
         }
 
         private static IEnumerable<SettingDescriptor> ReadSettingMetadata<T>()