alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 10:04:44 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Revert "Merge pull request #452 from Bond-009/activitydb"

Browse Source 
This reverts commit 48ad18d12b, reversing
changes made to fe197415ca.
This commit is contained in:
Erwin de Haan
2019-01-25 21:33:58 +01:00
committed by Bond-009
parent e0315b5695
commit d1a0497f55
10 changed files with 369 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Emby.Server.Implementations/ApplicationHost.cs
View File

@@ -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;
}