From ef7d8a7d1482425abfb17754107a8d7a560a5d4b Mon Sep 17 00:00:00 2001
From: Sergey Gut <kruzefag@gmail.com>
Date: Mon, 2 Mar 2020 18:10:19 +0400
Subject: [PATCH] Debug logs in fetcher/sender, fixed error in HS

---
 Core/Core.cs                                     | 4 +++-
 Core/Service/AbstractTimedHostedService.cs       | 3 ++-
 modules/RichSiteSummary/RichSiteSummary.cs       | 4 +++-
 modules/RichSiteSummary/Service/MessageSender.cs | 3 +++
 modules/RichSiteSummary/Service/RssFetch.cs      | 1 +
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Core/Core.cs b/Core/Core.cs
index bfe27e2..64e77ac 100644
--- a/Core/Core.cs
+++ b/Core/Core.cs
@@ -160,7 +160,9 @@ namespace Kruzya.TelegramBot.Core
 
         private void HookAppDomain()
         {
-            AppDomain.CurrentDomain.AssemblyResolve += delegate(object? sender, ResolveEventArgs args)
+            var appDomain = AppDomain.CurrentDomain;
+
+            appDomain.AssemblyResolve += delegate(object? sender, ResolveEventArgs args)
             {
                 var basePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
                 string assemblyPath = Path.Combine(basePath, new AssemblyName(args.Name).Name + ".dll");
diff --git a/Core/Service/AbstractTimedHostedService.cs b/Core/Service/AbstractTimedHostedService.cs
index 7566bdd..1aa9fc1 100644
--- a/Core/Service/AbstractTimedHostedService.cs
+++ b/Core/Service/AbstractTimedHostedService.cs
@@ -3,13 +3,14 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using BotFramework;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Telegram.Bot.Exceptions;
 using Telegram.Bot.Types;
 
 namespace Kruzya.TelegramBot.Core.Service
 {
-    public abstract class AbstractTimedHostedService
+    public abstract class AbstractTimedHostedService : IHostedService, IDisposable
     {
         private Timer _timer;
         
diff --git a/modules/RichSiteSummary/RichSiteSummary.cs b/modules/RichSiteSummary/RichSiteSummary.cs
index e902626..187972a 100644
--- a/modules/RichSiteSummary/RichSiteSummary.cs
+++ b/modules/RichSiteSummary/RichSiteSummary.cs
@@ -30,7 +30,9 @@ namespace Kruzya.TelegramBot.RichSiteSummary
             services.AddQueue<UserMessage>()
                 .AddQueue<UserUnsubscribe>();
 
-            services.AddHostedService<RssFetch>();
+            services.AddHostedService<RssFetch>()
+                .AddHostedService<Unsubscriber>()
+                .AddHostedService<MessageSender>();
         }
     }
 }
\ No newline at end of file
diff --git a/modules/RichSiteSummary/Service/MessageSender.cs b/modules/RichSiteSummary/Service/MessageSender.cs
index 227a1ab..2995e99 100644
--- a/modules/RichSiteSummary/Service/MessageSender.cs
+++ b/modules/RichSiteSummary/Service/MessageSender.cs
@@ -36,6 +36,7 @@ namespace Kruzya.TelegramBot.RichSiteSummary.Service
                 return;
             }
 
+            _logger.LogDebug($"Message for {message.ChatId.Identifier} dequeued.");
             try
             {
                 await _bot.BotClient.SendTextMessageAsync(message.ChatId, message.Text, message.ParseMode,
@@ -43,6 +44,7 @@ namespace Kruzya.TelegramBot.RichSiteSummary.Service
             }
             catch (ApiRequestException e)
             {
+                _logger.LogDebug($"Message for {message.ChatId.Identifier} is failed: {e.Message}.");
                 if (!e.Message.Contains("bot was blocked by user"))
                 {
                     ReEnqueue(message, e, message.ChatId); // looks like a network issue
@@ -58,6 +60,7 @@ namespace Kruzya.TelegramBot.RichSiteSummary.Service
             }
             catch (Exception e)
             {
+                _logger.LogDebug($"Message for {message.ChatId.Identifier} is failed: {e.Message}.");
                 ReEnqueue(message, e);
             }
         }
diff --git a/modules/RichSiteSummary/Service/RssFetch.cs b/modules/RichSiteSummary/Service/RssFetch.cs
index c8299d6..251ae94 100644
--- a/modules/RichSiteSummary/Service/RssFetch.cs
+++ b/modules/RichSiteSummary/Service/RssFetch.cs
@@ -156,6 +156,7 @@ namespace Kruzya.TelegramBot.RichSiteSummary.Service
                         };
 
                         _queue.Enqueue(message);
+                        _logger.LogDebug($"Enqueued message for {subscriber.SubscriberId}");
                     }
                 }
             }