aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/ApplicationHost.cs
diff options
context:
space:
mode:
authorErwin de Haan <EraYaN@users.noreply.github.com>2019-01-25 21:33:58 +0100
committerBond-009 <bond.009@outlook.com>2019-01-25 23:32:06 +0100
commitd1a0497f55c7f41fe9f01bbed328967e381fd394 (patch)
treec67c1d3da5af32beac90e8480cf3f8827d042a39 /Emby.Server.Implementations/ApplicationHost.cs
parente0315b569591b71938829a8f35ac264399ef66bd (diff)
Revert "Merge pull request #452 from Bond-009/activitydb"
This reverts commit 48ad18d12baeeb42ec0ec7df9473330dcbc76754, reversing changes made to fe197415cac19c0e4005c52761c5e7a37b8a4557.
Diffstat (limited to 'Emby.Server.Implementations/ApplicationHost.cs')
-rw-r--r--Emby.Server.Implementations/ApplicationHost.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index f5a4f1581..c8c4da0f7 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -709,7 +709,7 @@ namespace Emby.Server.Implementations
}
}
- public async Task InitAsync()
+ public void Init()
{
HttpPort = ServerConfigurationManager.Configuration.HttpServerPortNumber;
HttpsPort = ServerConfigurationManager.Configuration.HttpsPortNumber;
@@ -739,7 +739,7 @@ namespace Emby.Server.Implementations
SetHttpLimit();
- await RegisterResourcesAsync();
+ RegisterResources();
FindParts();
}
@@ -754,7 +754,7 @@ namespace Emby.Server.Implementations
/// <summary>
/// Registers resources that classes will depend on
/// </summary>
- protected async Task RegisterResourcesAsync()
+ protected void RegisterResources()
{
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 = await GetActivityLogRepositoryAsync();
+ var activityLogRepo = GetActivityLogRepository();
RegisterSingleInstance(activityLogRepo);
RegisterSingleInstance<IActivityManager>(new ActivityManager(LoggerFactory, activityLogRepo, UserManager));
@@ -1146,11 +1146,11 @@ namespace Emby.Server.Implementations
return repo;
}
- private async Task<IActivityRepository> GetActivityLogRepositoryAsync()
+ private IActivityRepository GetActivityLogRepository()
{
- var repo = new ActivityRepository(ServerConfigurationManager.ApplicationPaths.DataPath);
+ var repo = new ActivityRepository(LoggerFactory, ServerConfigurationManager.ApplicationPaths, FileSystemManager);
- await repo.Database.EnsureCreatedAsync();
+ repo.Initialize();
return repo;
}