Revert "refactor(Core/Time): Introduce GetExpirationTime instead of c…

…alculati… (azerothcore#21006)"

This reverts commit 7714ca3.

src/common/Metric/Metric.cpp

@@ -18,7 +18,6 @@
 #include "Metric.h"
 #include "Config.h"
 #include "Log.h"
-#include "SteadyTimer.h"
 #include "Strand.h"
 #include "Tokenize.h"
 #include <boost/algorithm/string/replace.hpp>
@@ -247,7 +246,9 @@ void Metric::ScheduleSend()
 {
     if (_enabled)
     {
-        _batchTimer->expires_at(Acore::Asio::SteadyTimer::GetExpirationTime(_updateInterval));
+        // Calculate the expiration time
+        auto expirationTime = std::chrono::steady_clock::now() + std::chrono::seconds(_updateInterval);
+        _batchTimer->expires_at(expirationTime);
         _batchTimer->async_wait(std::bind(&Metric::SendBatch, this));
     }
     else
@@ -280,7 +281,9 @@ void Metric::ScheduleOverallStatusLog()
 {
     if (_enabled)
     {
-        _overallStatusTimer->expires_at(Acore::Asio::SteadyTimer::GetExpirationTime(_overallStatusTimerInterval));
+        // Calculate the expiration time _overallStatusTimerInterval from now
+        auto expirationTime = std::chrono::steady_clock::now() + std::chrono::seconds(_overallStatusTimerInterval);
+        _overallStatusTimer->expires_at(expirationTime);
         _overallStatusTimer->async_wait([this](const boost::system::error_code&)
         {
             _overallStatusTimerTriggered = true;

src/server/apps/authserver/Main.cpp

@@ -38,7 +38,6 @@
 #include "RealmList.h"
 #include "SecretMgr.h"
 #include "SharedDefines.h"
-#include "SteadyTimer.h"
 #include "Util.h"
 #include <boost/asio/signal_set.hpp>
 #include <boost/program_options.hpp>
@@ -180,13 +179,17 @@ int main(int argc, char** argv)
     int32 dbPingInterval = sConfigMgr->GetOption<int32>("MaxPingTime", 30);
     std::shared_ptr<boost::asio::steady_timer> dbPingTimer = std::make_shared<boost::asio::steady_timer>(*ioContext);
 
-    dbPingTimer->expires_at(Acore::Asio::SteadyTimer::GetExpirationTime(dbPingInterval * MINUTE));
+    // Calculate the expiration time
+    auto expirationTime = std::chrono::steady_clock::now() + std::chrono::seconds(dbPingInterval);
+    dbPingTimer->expires_at(expirationTime);
     dbPingTimer->async_wait(std::bind(&KeepDatabaseAliveHandler, std::weak_ptr<boost::asio::steady_timer>(dbPingTimer), dbPingInterval, std::placeholders::_1));
 
     int32 banExpiryCheckInterval = sConfigMgr->GetOption<int32>("BanExpiryCheckInterval", 60);
     std::shared_ptr<boost::asio::steady_timer> banExpiryCheckTimer = std::make_shared<boost::asio::steady_timer>(*ioContext);
 
-    banExpiryCheckTimer->expires_at(Acore::Asio::SteadyTimer::GetExpirationTime(banExpiryCheckInterval));
+    // Calculate the expiration time
+    auto expirationTimeBanExpiry = std::chrono::steady_clock::now() + std::chrono::seconds(banExpiryCheckInterval);
+    banExpiryCheckTimer->expires_at(expirationTimeBanExpiry);
     banExpiryCheckTimer->async_wait(std::bind(&BanExpiryHandler, std::weak_ptr<boost::asio::steady_timer>(banExpiryCheckTimer), banExpiryCheckInterval, std::placeholders::_1));
 
     // Start the io service worker loop
@@ -249,7 +252,9 @@ void KeepDatabaseAliveHandler(std::weak_ptr<boost::asio::steady_timer> dbPingTim
             LOG_INFO("server.authserver", "Ping MySQL to keep connection alive");
             LoginDatabase.KeepAlive();
 
-            dbPingTimer->expires_at(Acore::Asio::SteadyTimer::GetExpirationTime(dbPingInterval));
+            // Calculate the expiration time
+            auto expirationTime = std::chrono::steady_clock::now() + std::chrono::seconds(dbPingInterval);
+            dbPingTimer->expires_at(expirationTime);
             dbPingTimer->async_wait(std::bind(&KeepDatabaseAliveHandler, dbPingTimerRef, dbPingInterval, std::placeholders::_1));
         }
     }
@@ -264,7 +269,9 @@ void BanExpiryHandler(std::weak_ptr<boost::asio::steady_timer> banExpiryCheckTim
             LoginDatabase.Execute(LoginDatabase.GetPreparedStatement(LOGIN_DEL_EXPIRED_IP_BANS));
             LoginDatabase.Execute(LoginDatabase.GetPreparedStatement(LOGIN_UPD_EXPIRED_ACCOUNT_BANS));
 
-            banExpiryCheckTimer->expires_at(Acore::Asio::SteadyTimer::GetExpirationTime(banExpiryCheckInterval));
+            // Calculate the expiration time
+            auto expirationTime = std::chrono::steady_clock::now() + std::chrono::seconds(banExpiryCheckInterval);
+            banExpiryCheckTimer->expires_at(expirationTime);
             banExpiryCheckTimer->async_wait(std::bind(&BanExpiryHandler, banExpiryCheckTimerRef, banExpiryCheckInterval, std::placeholders::_1));
         }
     }

src/server/apps/worldserver/Main.cpp

@@ -47,7 +47,6 @@
 #include "ScriptMgr.h"
 #include "SecretMgr.h"
 #include "SharedDefines.h"
-#include "SteadyTimer.h"
 #include "World.h"
 #include "WorldSocket.h"
 #include "WorldSocketMgr.h"
@@ -91,7 +90,9 @@ class FreezeDetector
 
     static void Start(std::shared_ptr<FreezeDetector> const& freezeDetector)
     {
-        freezeDetector->_timer.expires_at(Acore::Asio::SteadyTimer::GetExpirationTime(5));
+        // Calculate the expiration time 5seconds from now
+        auto expirationTime = std::chrono::steady_clock::now() + std::chrono::seconds(5);
+        freezeDetector->_timer.expires_at(expirationTime);
         freezeDetector->_timer.async_wait(std::bind(&FreezeDetector::Handler, std::weak_ptr<FreezeDetector>(freezeDetector), std::placeholders::_1));
     }
 
@@ -631,7 +632,9 @@ void FreezeDetector::Handler(std::weak_ptr<FreezeDetector> freezeDetectorRef, bo
                 }
             }
 
-            freezeDetector->_timer.expires_at(Acore::Asio::SteadyTimer::GetExpirationTime(1));
+            // Calculate the expiration time
+            auto expirationTime = std::chrono::steady_clock::now() + std::chrono::seconds(1);
+            freezeDetector->_timer.expires_at(expirationTime);
             freezeDetector->_timer.async_wait(std::bind(&FreezeDetector::Handler, freezeDetectorRef, std::placeholders::_1));
         }
     }

src/server/shared/Realms/RealmList.cpp

@@ -18,9 +18,8 @@
 #include "RealmList.h"
 #include "DatabaseEnv.h"
 #include "Log.h"
-#include "QueryResult.h"
 #include "Resolver.h"
-#include "SteadyTimer.h"
+#include "QueryResult.h"
 #include "Util.h"
 #include <boost/asio/ip/tcp.hpp>
 #include <memory>
@@ -228,7 +227,9 @@ void RealmList::UpdateRealms(boost::system::error_code const& error)
 
     if (_updateInterval)
     {
-        _updateTimer->expires_at(Acore::Asio::SteadyTimer::GetExpirationTime(_updateInterval));
+        // Calculate the expiration time _updateInterval from now
+        auto expiration_time = std::chrono::steady_clock::now() + std::chrono::seconds(_updateInterval);
+        _updateTimer->expires_at(expiration_time);
         _updateTimer->async_wait([this](boost::system::error_code const& errorCode){ UpdateRealms(errorCode); });
     }
 }