diff --git a/products/ASC.Files/Server/Api/PrivacyRoomController.cs b/products/ASC.Files/Server/Api/PrivacyRoomController.cs index 33cab69869..6533b07f0b 100644 --- a/products/ASC.Files/Server/Api/PrivacyRoomController.cs +++ b/products/ASC.Files/Server/Api/PrivacyRoomController.cs @@ -193,7 +193,7 @@ public abstract class PrivacyRoomControllerCommon : ControllerBase return new { isset = true }; } - _logger.LogInformation("User {userId} updates address", _authContext.CurrentAccount.ID); + _logger.InformationUpdateAddress(_authContext.CurrentAccount.ID); } _encryptionKeyPairHelper.SetKeyPair(inDto.PublicKey, inDto.PrivateKeyEnc); diff --git a/products/ASC.Files/Server/GlobalUsings.cs b/products/ASC.Files/Server/GlobalUsings.cs index f3e9a72e3a..471cf5f476 100644 --- a/products/ASC.Files/Server/GlobalUsings.cs +++ b/products/ASC.Files/Server/GlobalUsings.cs @@ -52,6 +52,7 @@ global using ASC.Files.Core.ApiModels.ResponseDto; global using ASC.Files.Core.Security; global using ASC.Files.Core.Services.OFormService; global using ASC.Files.Helpers; +global using ASC.Files.Log; global using ASC.MessagingSystem.Core; global using ASC.Web.Api.Routing; global using ASC.Web.Core.Files; diff --git a/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs b/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs index 34f8363084..2a56fc62ec 100644 --- a/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs +++ b/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs @@ -120,7 +120,7 @@ public class FilesControllerHelper : FilesHelperBase catch (Exception e) { o.File = r.Result; - _logger.LogError(e, "CheckConversion"); + _logger.ErrorCheckConversion(e); } } diff --git a/products/ASC.Files/Server/Log/FilesControllerHelperLogger.cs b/products/ASC.Files/Server/Log/FilesControllerHelperLogger.cs new file mode 100644 index 0000000000..4b35bfc164 --- /dev/null +++ b/products/ASC.Files/Server/Log/FilesControllerHelperLogger.cs @@ -0,0 +1,33 @@ +// (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.Files.Log; + +internal static partial class FilesControllerHelperLogger +{ + [LoggerMessage(Level = LogLevel.Error, Message = "CheckConversion")] + public static partial void ErrorCheckConversion(this ILogger logger, Exception exception); +} diff --git a/products/ASC.Files/Server/Log/PrivacyRoomControllerLogger.cs b/products/ASC.Files/Server/Log/PrivacyRoomControllerLogger.cs new file mode 100644 index 0000000000..79b4912edc --- /dev/null +++ b/products/ASC.Files/Server/Log/PrivacyRoomControllerLogger.cs @@ -0,0 +1,33 @@ +// (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.Files.Log; + +internal static partial class PrivacyRoomControllerLogger +{ + [LoggerMessage(Level = LogLevel.Information, Message = "User {userId} updates address")] + public static partial void InformationUpdateAddress(this ILogger logger, Guid userId); +}