From b5ac317e8203dcb6380153e8527c7268351bdc33 Mon Sep 17 00:00:00 2001 From: Ben Schumacher Date: Mon, 12 Aug 2024 14:40:04 +0200 Subject: [PATCH] [MM-60152] Fix notifications log file location for Support Packet (#27921) --- server/channels/app/platform/log.go | 2 +- server/channels/app/platform/log_test.go | 2 +- server/channels/app/support_packet_test.go | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/channels/app/platform/log.go b/server/channels/app/platform/log.go index 88813b180e..47826c9d24 100644 --- a/server/channels/app/platform/log.go +++ b/server/channels/app/platform/log.go @@ -230,7 +230,7 @@ func (ps *PlatformService) GetNotificationLogFile(_ request.CTX) (*model.FileDat return nil, errors.New("Unable to retrieve notifications logs because NotificationLogSettings.EnableFile is set to false") } - notificationsLog := config.GetNotificationsLogFileLocation(*ps.Config().LogSettings.FileLocation) + notificationsLog := config.GetNotificationsLogFileLocation(*ps.Config().NotificationLogSettings.FileLocation) notificationsLogFileData, err := os.ReadFile(notificationsLog) if err != nil { return nil, errors.Wrapf(err, "failed read notifcation log file at path %s", notificationsLog) diff --git a/server/channels/app/platform/log_test.go b/server/channels/app/platform/log_test.go index a5a8c5c1b3..831144ddd3 100644 --- a/server/channels/app/platform/log_test.go +++ b/server/channels/app/platform/log_test.go @@ -81,7 +81,7 @@ func TestGetNotificationLogFile(t *testing.T) { // Enable notifications file but point to an empty directory to get an error trying to read the file th.Service.UpdateConfig(func(cfg *model.Config) { *cfg.NotificationLogSettings.EnableFile = true - *cfg.LogSettings.FileLocation = dir + *cfg.NotificationLogSettings.FileLocation = dir }) logLocation := config.GetNotificationsLogFileLocation(dir) diff --git a/server/channels/app/support_packet_test.go b/server/channels/app/support_packet_test.go index 8088f66c30..8b91b81496 100644 --- a/server/channels/app/support_packet_test.go +++ b/server/channels/app/support_packet_test.go @@ -193,6 +193,7 @@ func TestGenerateSupportPacket(t *testing.T) { th.App.UpdateConfig(func(cfg *model.Config) { *cfg.LogSettings.FileLocation = dir + *cfg.NotificationLogSettings.FileLocation = dir }) logLocation := config.GetLogFileLocation(dir)