From 43e1228c168994796cae61bcbfb1a25fd129a377 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Sun, 15 Jan 2017 16:05:01 +0100 Subject: [PATCH] Code cleanup --- ArchiSteamFarm/Bot.cs | 56 +++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs index 80675ed3b..62abf0833 100755 --- a/ArchiSteamFarm/Bot.cs +++ b/ArchiSteamFarm/Bot.cs @@ -762,6 +762,19 @@ namespace ArchiSteamFarm { ArchiLogger.LogGenericInfo(Strings.BotAuthenticatorImportFinished); } + private void InitConnectionFailureTimer() { + if (ConnectionFailureTimer != null) { + return; + } + + ConnectionFailureTimer = new Timer( + e => InitPermanentConnectionFailure(), + null, + TimeSpan.FromMinutes(2), // Delay + Timeout.InfiniteTimeSpan // Period + ); + } + private async Task Initialize() { if (!BotConfig.Enabled) { ArchiLogger.LogGenericInfo(Strings.BotInstanceNotStartingBecauseDisabled); @@ -797,6 +810,12 @@ namespace ArchiSteamFarm { return !string.IsNullOrEmpty(BotConfig.SteamPassword); } + private void InitPermanentConnectionFailure() { + ArchiLogger.LogGenericError(Strings.BotHeartBeatFailed); + Destroy(true); + new Bot(BotName).Forget(); + } + private bool IsMaster(ulong steamID) { if (steamID != 0) { return (steamID == BotConfig.SteamMasterID) || IsOwner(steamID); @@ -912,34 +931,6 @@ namespace ArchiSteamFarm { } } - private void InitPermanentConnectionFailure() { - ArchiLogger.LogGenericError(Strings.BotHeartBeatFailed); - Destroy(true); - new Bot(BotName).Forget(); - } - - private void InitConnectionFailureTimer() { - if (ConnectionFailureTimer != null) { - return; - } - - ConnectionFailureTimer = new Timer( - e => InitPermanentConnectionFailure(), - null, - TimeSpan.FromMinutes(2), // Delay - Timeout.InfiniteTimeSpan // Period - ); - } - - private void StopConnectionFailureTimer() { - if (ConnectionFailureTimer == null) { - return; - } - - ConnectionFailureTimer.Dispose(); - ConnectionFailureTimer = null; - } - private void OnConnected(SteamClient.ConnectedCallback callback) { if (callback == null) { ArchiLogger.LogNullError(nameof(callback)); @@ -2536,6 +2527,15 @@ namespace ArchiSteamFarm { ); } + private void StopConnectionFailureTimer() { + if (ConnectionFailureTimer == null) { + return; + } + + ConnectionFailureTimer.Dispose(); + ConnectionFailureTimer = null; + } + private void StopFamilySharingInactivityTimer() { if (FamilySharingInactivityTimer == null) { return;