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

add loggers

Browse Source
This commit is contained in:
Anton Suhorukov 2022-05-11 18:45:37 +03:00
parent 92c6844810
commit 4ff9fcd55a
5 changed files with 108 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/services/ASC.Feed.Aggregator/GlobalUsings.cs
View File

@ -32,6 +32,8 @@ global using ASC.Common.Utils;
global using ASC.Core;
global using ASC.Core.Common;
global using ASC.Core.Notify.Signalr;
global using ASC.Feed.Aggregator.Log
global using ASC.Feed.Aggregator.Modules;
global using ASC.Feed.Configuration;
global using ASC.Feed.Core;

53
common/services/ASC.Feed.Aggregator/Log/FeedAggregatorServiceLogger.cs Normal file
View File

@ -0,0 +1,53 @@
// (c) Copyright Ascensio System SIA 2010-2022
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Feed.Aggregator.Log;
internal static partial class FeedAggregatorServiceLogger
{
[LoggerMessage(Level = LogLevel.Information, Message = "Feed Aggregator service running.")]
public static partial void InformationAggregatorServiceRunning(this ILogger logger);
[LoggerMessage(Level = LogLevel.Information, Message = "Feed Aggregator service stopping.")]
public static partial void InformationAggregatorServiceStopping(this ILogger logger);
[LoggerMessage(Level = LogLevel.Debug, Message = "Start of collecting feeds...")]
public static partial void DebugStartCollectiongFeeds(this ILogger logger);
[LoggerMessage(Level = LogLevel.Debug, Message = "Find {tenantsCount} tenants for module {moduleName}.")]
public static partial void DebugFindCountTenants(this ILogger logger, int tenantsCount, string moduleName);
[LoggerMessage(Level = LogLevel.Debug, Message = "{count} feeds in {tenant} tenant.")]
public static partial void DebugCountFeeds(this ILogger logger, int count, int tenant);
[LoggerMessage(Level = LogLevel.Error, Message = "Tenant: {tenant}")]
public static partial void ErrorTenant(this ILogger logger, int tenant, Exception exception);
[LoggerMessage(Level = LogLevel.Debug, Message = "Time of collecting news: {date}")]
public static partial void DebugTimeCollectingNews(this ILogger logger, TimeSpan date);
[LoggerMessage(Level = LogLevel.Debug, Message = "AggregateFeeds")]
public static partial void ErrorAggregateFeeds(this ILogger logger, Exception exception);
}

41
common/services/ASC.Feed.Aggregator/Log/FeedCleanerServiceLogger.cs Normal file
View File

@ -0,0 +1,41 @@
// (c) Copyright Ascensio System SIA 2010-2022
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Feed.Aggregator.Log;
internal static partial class FeedCleanerServiceLogger
{
[LoggerMessage(Level = LogLevel.Debug, Message = "Feed Cleaner Service running.")]
public static partial void InformationFeedCleanerRunning(this ILogger logger);
[LoggerMessage(Level = LogLevel.Information, Message = "Feed Cleaner Service stopping.")]
public static partial void InformationFeedCleanerStopping(this ILogger logger);
[LoggerMessage(Level = LogLevel.Debug, Message = "Start of removing old news")]
public static partial void DebugStartRemoving(this ILogger logger);
[LoggerMessage(Level = LogLevel.Error, Message = "RemoveFeeds")]
public static partial void ErrorRemoveFeeds(this ILogger logger, Exception exception);
}

16
common/services/ASC.Feed.Aggregator/Service/FeedAggregatorService.cs
View File

@ -45,7 +45,7 @@ public class FeedAggregatorService : FeedBaseService
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
_logger.LogInformation("Feed Aggregator service running.");
_logger.InformationAggregatorServiceRunning();
var cfg = _feedSettings;
@ -56,7 +56,7 @@ public class FeedAggregatorService : FeedBaseService
await Task.Delay(cfg.AggregatePeriod, stoppingToken);
}
_logger.LogInformation("Feed Aggregator Service stopping.");
_logger.InformationAggregatorServiceStopping();
}
private static T Attempt<T>(int count, Func<T> action)
@ -102,7 +102,7 @@ public class FeedAggregatorService : FeedBaseService
baseCommonLinkUtility.Initialize(cfg.ServerRoot);
var start = DateTime.UtcNow;
_logger.LogDebug("Start of collecting feeds...");
_logger.DebugStartCollectiongFeeds();
var unreadUsers = new Dictionary<int, Dictionary<Guid, int>>();
var modules = scope.ServiceProvider.GetService<IEnumerable<IFeedModule>>();
@ -125,7 +125,7 @@ public class FeedAggregatorService : FeedBaseService
var toTime = DateTime.UtcNow;
var tenants = Attempt(10, () => module.GetTenantsWithFeeds(fromTime)).ToList();
_logger.LogDebug("Find {tenantsCount} tenants for module {moduleName}.", tenants.Count, module.GetType().Name);
_logger.DebugFindCountTenants(tenants.Count, module.GetType().Name);
foreach (var tenant in tenants)
{
@ -146,7 +146,7 @@ public class FeedAggregatorService : FeedBaseService
var users = userManager.GetUsers();
var feeds = Attempt(10, () => module.GetFeeds(new FeedFilter(fromTime, toTime) { Tenant = tenant }).Where(r => r.Item1 != null).ToList());
_logger.LogDebug("{count} feeds in {tenant} tenant.", feeds.Count, tenant);
_logger.DebugCountFeeds(feeds.Count, tenant);
var tenant1 = tenant;
var module1 = module;
@ -172,7 +172,7 @@ public class FeedAggregatorService : FeedBaseService
}
catch (Exception ex)
{
_logger.LogError(ex, "Tenant: {tenant}", tenant);
_logger.ErrorTenant(tenant, ex);
}
}
@ -202,11 +202,11 @@ public class FeedAggregatorService : FeedBaseService
_signalrServiceClient.SendUnreadUsers(unreadUsers);
_logger.LogDebug("Time of collecting news: {date}", DateTime.UtcNow - start);
_logger.DebugTimeCollectingNews(DateTime.UtcNow - start);
}
catch (Exception ex)
{
_logger.LogError(ex, "AggregateFeeds");
_logger.ErrorAggregateFeeds(ex);
}
}
}

8
common/services/ASC.Feed.Aggregator/Service/FeedCleanerService.cs
View File

@ -41,7 +41,7 @@ public class FeedCleanerService : FeedBaseService
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
_logger.LogInformation("Feed Cleaner Service running.");
_logger.InformationFeedCleanerRunning();
var cfg = _feedSettings;
@ -52,7 +52,7 @@ public class FeedCleanerService : FeedBaseService
RemoveFeeds(cfg.AggregateInterval);
}
_logger.LogInformation("Feed Cleaner Service stopping.");
_logger.InformationFeedCleanerStopping();
}
private void RemoveFeeds(object interval)
@ -62,13 +62,13 @@ public class FeedCleanerService : FeedBaseService
using var scope = _serviceScopeFactory.CreateScope();
var feedAggregateDataProvider = scope.ServiceProvider.GetService<FeedAggregateDataProvider>();
_logger.LogDebug("Start of removing old news");
_logger.DebugStartRemoving();
feedAggregateDataProvider.RemoveFeedAggregate(DateTime.UtcNow.Subtract((TimeSpan)interval));
}
catch (Exception ex)
{
_logger.LogError(ex, "RemoveFeeds");
_logger.ErrorRemoveFeeds(ex);
}
}
}