From e2a5ec361672120d1deeddf60fd1364f79309045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C3=B6ls?= <6608231+Abrynos@users.noreply.github.com> Date: Sun, 21 Apr 2024 16:21:33 +0200 Subject: [PATCH] Fix monitoring plugin (#3191) * Misc. * Fix ASF crash * Remove warning about automatic update of custom plugins if there is only official plugins enabled * Fix previous mistake * Revert "Fix ASF crash" This reverts commit 42209e93ce315a5c635d2768e87ef09a7e95091e. --- ArchiSteamFarm.OfficialPlugins.Monitoring/MonitoringPlugin.cs | 2 +- ArchiSteamFarm/Plugins/PluginsCore.cs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ArchiSteamFarm.OfficialPlugins.Monitoring/MonitoringPlugin.cs b/ArchiSteamFarm.OfficialPlugins.Monitoring/MonitoringPlugin.cs index d00ba2a3d..4666b67db 100644 --- a/ArchiSteamFarm.OfficialPlugins.Monitoring/MonitoringPlugin.cs +++ b/ArchiSteamFarm.OfficialPlugins.Monitoring/MonitoringPlugin.cs @@ -198,7 +198,7 @@ internal sealed class MonitoringPlugin : OfficialPlugin, IDisposable, IGitHubPlu $"{MetricNamePrefix}_bot_farming_time_remaining_{Units.Minutes}", static () => { IEnumerable bots = Bot.Bots?.Values ?? []; - return bots.Select(static bot => new Measurement(bot.CardsFarmer.TimeRemaining.TotalMinutes, new KeyValuePair(TagNames.BotName, bot.BotName), new KeyValuePair(TagNames.SteamID, bot.SteamID))); + return bots.Where(static bot => bot.IsConnectedAndLoggedOn).Select(static bot => new Measurement(bot.CardsFarmer.TimeRemaining.TotalMinutes, new KeyValuePair(TagNames.BotName, bot.BotName), new KeyValuePair(TagNames.SteamID, bot.SteamID))); }, Units.Minutes, "Approximate number of minutes remaining until each bot has finished farming all cards" diff --git a/ArchiSteamFarm/Plugins/PluginsCore.cs b/ArchiSteamFarm/Plugins/PluginsCore.cs index dbc581a8a..a56e9b456 100644 --- a/ArchiSteamFarm/Plugins/PluginsCore.cs +++ b/ArchiSteamFarm/Plugins/PluginsCore.cs @@ -305,7 +305,9 @@ public static class PluginsCore { } if (activePluginUpdates.Count > 0) { - ASF.ArchiLogger.LogGenericWarning(Strings.CustomPluginUpdatesEnabled); + if (activePluginUpdates.Any(static plugin => plugin is not OfficialPlugin)) { + ASF.ArchiLogger.LogGenericWarning(Strings.CustomPluginUpdatesEnabled); + } ActivePluginUpdates = activePluginUpdates.ToFrozenSet(); }