IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer

Browse Source
This commit is contained in:
Daniil Senkiv 2019-11-12 12:15:03 +03:00
commit 92a2f17929
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/ASC.Core.Common/Configuration/Consumer.cs
View File

@ -92,7 +92,9 @@ namespace ASC.Core.Common.Configuration
}
public Consumer()
{
{
Props = new Dictionary<string, string>();
Additional = new Dictionary<string, string>();
}
public Consumer(
@ -100,7 +102,7 @@ namespace ASC.Core.Common.Configuration
CoreBaseSettings coreBaseSettings,
CoreSettings coreSettings,
IConfiguration configuration,
ICacheNotify<ConsumerCacheItem> cache)
ICacheNotify<ConsumerCacheItem> cache) : this()
{
TenantManager = tenantManager;
CoreBaseSettings = coreBaseSettings;
@ -110,8 +112,6 @@ namespace ASC.Core.Common.Configuration
OnlyDefault = configuration["core:default-consumers"] == "true";
Name = "";
Order = int.MaxValue;
Props = new Dictionary<string, string>();
Additional = new Dictionary<string, string>();
}
public Consumer(
@ -285,7 +285,7 @@ namespace ASC.Core.Common.Configuration
public const string HandlerTypeKey = "handlerType";
public const string CdnKey = "cdn";
public DataStoreConsumer()
public DataStoreConsumer() : base()
{
}

3
web/ASC.Web.Api/Controllers/SettingsController.cs
View File

@ -1405,7 +1405,8 @@ namespace ASC.Api.Settings
.AddStorageHelperService()
.AddTenantLogoManagerService()
.AddBuildVersionService()
.AddStatisticManagerService();
.AddStatisticManagerService()
.AddEmployeeWraper();
}
}
}