Merge pull request #700 from jellyfin/dev

Dev sync

1 files changed, 7 insertions, 7 deletions

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index c8c4da0f7..f5a4f1581 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -709,7 +709,7 @@ namespace Emby.Server.Implementations
             }
         }
 
-        public void Init()
+        public async Task InitAsync()
         {
             HttpPort = ServerConfigurationManager.Configuration.HttpServerPortNumber;
             HttpsPort = ServerConfigurationManager.Configuration.HttpsPortNumber;
@@ -739,7 +739,7 @@ namespace Emby.Server.Implementations
 
             SetHttpLimit();
 
-            RegisterResources();
+            await RegisterResourcesAsync();
 
             FindParts();
         }
@@ -754,7 +754,7 @@ namespace Emby.Server.Implementations
         /// <summary>
         /// Registers resources that classes will depend on
         /// </summary>
-        protected void RegisterResources()
+        protected async Task RegisterResourcesAsync()
         {
             RegisterSingleInstance(ConfigurationManager);
             RegisterSingleInstance<IApplicationHost>(this);
@@ -931,7 +931,7 @@ namespace Emby.Server.Implementations
             EncodingManager = new MediaEncoder.EncodingManager(FileSystemManager, LoggerFactory, MediaEncoder, ChapterManager, LibraryManager);
             RegisterSingleInstance(EncodingManager);
 
-            var activityLogRepo = GetActivityLogRepository();
+            var activityLogRepo = await GetActivityLogRepositoryAsync();
             RegisterSingleInstance(activityLogRepo);
             RegisterSingleInstance<IActivityManager>(new ActivityManager(LoggerFactory, activityLogRepo, UserManager));
 
@@ -1146,11 +1146,11 @@ namespace Emby.Server.Implementations
             return repo;
         }
 
-        private IActivityRepository GetActivityLogRepository()
+        private async Task<IActivityRepository> GetActivityLogRepositoryAsync()
         {
-            var repo = new ActivityRepository(LoggerFactory, ServerConfigurationManager.ApplicationPaths, FileSystemManager);
+            var repo = new ActivityRepository(ServerConfigurationManager.ApplicationPaths.DataPath);
 
-            repo.Initialize();
+            await repo.Database.EnsureCreatedAsync();
 
             return repo;
         }