Fix startup caching. Clean up. Throw exceptions to actually halt startup

ShokoAnime · Jul 30, 2017 · 30c912b · 30c912b
1 parent 1053c75
commit 30c912b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 21 deletions.
diff --git a/Shoko.Server/Databases/DatabaseFactory.cs b/Shoko.Server/Databases/DatabaseFactory.cs
@@ -111,17 +111,17 @@ public static bool InitDB()
                             MessageBoxButton.OK, MessageBoxImage.Error);
                         ServerState.Instance.CurrentSetupStatus =
                             Commons.Properties.Resources.Server_DatabaseFail;
+                        return false;
                     }
-                    else
+                    if (ex is TimeoutException)
                     {
-                        if (ex is TimeoutException)
-                        {
-                            logger.Error(ex, "Database TimeOut: " + ex.ToString());
-                            ServerState.Instance.CurrentSetupStatus =
-                                Commons.Properties.Resources.Server_DatabaseTimeOut;
-                        }
+                        logger.Error(ex, "Database TimeOut: " + ex.ToString());
+                        ServerState.Instance.CurrentSetupStatus =
+                            Commons.Properties.Resources.Server_DatabaseTimeOut;
+                        return false;
                     }
-                    return false;
+                    // throw to the outer try/catch
+                    throw;
                 }
 
                 return true;

diff --git a/Shoko.Server/Repositories/RepoFactory.cs b/Shoko.Server/Repositories/RepoFactory.cs
@@ -147,19 +147,7 @@ public static ICachedRepository CreateCachedRepository(ICachedRepository repo)
 
         public static void Init()
         {
-            try
-            {
-                foreach (var repo in CachedRepositories)
-                {
-                    Task task = new Task(() => repo.Populate());
-                    // don't wait longer than 3 minutes
-                    if (Task.WhenAny(task, Task.Delay(180000)).Result != task) throw new TimeoutException($"{repo.GetType()} took too long to cache.");
-                }
-            }
-            catch (Exception exception)
-            {
-                logger.Error($"There was an error starting the Database Factory - Caching: {exception}");
-            }
+            InitCaches();
 
             // Update Contracts if necessary
             try
@@ -176,10 +164,30 @@ public static void Init()
             catch (Exception e)
             {
                 logger.Error($"There was an error starting the Database Factory - Regenerating: {e}");
+                throw;
             }
             CleanUpMemory();
         }
 
+        public static void InitCaches()
+        {
+            try
+            {
+                foreach (var repo in CachedRepositories)
+                {
+                    Task task = Task.Run(() => repo.Populate());
+
+                    // don't wait longer than 3 minutes
+                    if (!task.Wait(180000)) throw new TimeoutException($"{repo.GetType()} took too long to cache.");
+                }
+            }
+            catch (Exception exception)
+            {
+                logger.Error($"There was an error starting the Database Factory - Caching: {exception}");
+                throw;
+            }
+        }
+
         public static void CleanUpMemory()
         {
             AniDB_Anime.GetAll().ForEach(a => a.CollectContractMemory());