Merge pull request #280 from github/fixes/fix-horrible-cache-leak

Fix premature cache disposal

Author: haacked

src/GitHub.App/Factories/HostCacheFactory.cs

@@ -39,5 +39,23 @@ public IBlobCache Create(HostAddress hostAddress)
 
         IOperatingSystem OperatingSystem { get { return operatingSystem.Value; } }
         IBlobCacheFactory BlobCacheFactory { get { return blobCacheFactory.Value; } }
+
+        bool disposed;
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (disposed) return;
+                disposed = true;
+                if (blobCacheFactory.IsValueCreated)
+                    blobCacheFactory.Value.Dispose();
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
     }
 }

src/GitHub.App/Factories/IBlobCacheFactory.cs

@@ -1,8 +1,9 @@
 using Akavache;
+using System;
 
 namespace GitHub.Factories
 {
-    public interface IBlobCacheFactory
+    public interface IBlobCacheFactory : IDisposable
     {
         IBlobCache CreateBlobCache(string path);
     }

src/GitHub.App/Factories/IHostCacheFactory.cs

@@ -1,9 +1,10 @@
 using Akavache;
 using GitHub.Primitives;
+using System;
 
 namespace GitHub.Factories
 {
-    public interface IHostCacheFactory
+    public interface IHostCacheFactory : IDisposable
     {
         IBlobCache Create(HostAddress hostAddress);
     }

src/GitHub.App/Factories/RepositoryHostFactory.cs

@@ -51,6 +51,7 @@ protected virtual void Dispose(bool disposing)
 
                 loginCache.Dispose();
                 avatarProvider.Dispose();
+                hostCacheFactory.Dispose();
                 disposed = true;
             }
         }

src/GitHub.App/Factories/SqlitePersistentBlobCacheFactory.cs

@@ -4,13 +4,15 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
+using System.Reactive.Disposables;
 
 namespace GitHub.Factories
 {
     [Export(typeof(IBlobCacheFactory))]
     [PartCreationPolicy(CreationPolicy.Shared)]
     public class SqlitePersistentBlobCacheFactory : IBlobCacheFactory
     {
+        readonly CompositeDisposable disposables = new CompositeDisposable();
         static readonly Logger log = LogManager.GetCurrentClassLogger();
         Dictionary<string, IBlobCache> cache = new Dictionary<string, IBlobCache>();
 
@@ -24,6 +26,7 @@ public IBlobCache CreateBlobCache(string path)
             {
                 var c = new SQLitePersistentBlobCache(path);
                 cache.Add(path, c);
+                disposables.Add(c);
                 return c;
             }
             catch(Exception ex)
@@ -32,5 +35,23 @@ public IBlobCache CreateBlobCache(string path)
                 return new InMemoryBlobCache();
             }
         }
+
+        bool disposed;
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (disposed) return;
+                disposed = true;
+                disposables.Dispose();
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
     }
 }

src/GitHub.App/Services/ModelService.cs

@@ -277,15 +277,6 @@ protected virtual void Dispose(bool disposing)
             if (disposing)
             {
                 if (disposed) return;
-
-                try
-                {
-                    hostCache.Dispose();
-                }
-                catch (Exception e)
-                {
-                    log.Warn("Exception occured while disposing host cache", e);
-                }
                 disposed = true;
             }
         }