Core/Battle.net: Improved logging - use separate filters instead of throwing everything to one logger

1 files changed, 11 insertions, 9 deletions

diff --git a/src/server/bnetserver/Realms/RealmList.cpp b/src/server/bnetserver/Realms/RealmList.cpp
index 8d6edb12b5c..2bf93e12cb3 100644
--- a/src/server/bnetserver/Realms/RealmList.cpp
+++ b/src/server/bnetserver/Realms/RealmList.cpp
@@ -97,7 +97,6 @@ void RealmList::UpdateRealm(Battlenet::RealmId const& id, const std::string& nam
     Realm& realm = _realms[id];
 
     realm.Keep = true;
-    realm.Updated = false;
 
     realm.Id = id;
     UpdateField(realm.Name, name, realm.Updated);
@@ -117,7 +116,7 @@ void RealmList::UpdateRealms(boost::system::error_code const& error)
     if (error)
         return;
 
-    TC_LOG_INFO("server.bnetserver", "Updating Realm List...");
+    TC_LOG_DEBUG("realmlist", "Updating Realm List...");
 
     PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_REALMLIST);
     PreparedQueryResult result = LoginDatabase.Query(stmt);
@@ -139,7 +138,7 @@ void RealmList::UpdateRealms(boost::system::error_code const& error)
                 boost::asio::ip::tcp::resolver::iterator endPoint = _resolver->resolve(externalAddressQuery, ec);
                 if (endPoint == end || ec)
                 {
-                    TC_LOG_ERROR("server.bnetserver", "Could not resolve address %s", fields[2].GetString().c_str());
+                    TC_LOG_ERROR("realmlist", "Could not resolve address %s", fields[2].GetString().c_str());
                     continue;
                 }
 
@@ -149,7 +148,7 @@ void RealmList::UpdateRealms(boost::system::error_code const& error)
                 endPoint = _resolver->resolve(localAddressQuery, ec);
                 if (endPoint == end || ec)
                 {
-                    TC_LOG_ERROR("server.bnetserver", "Could not resolve address %s", fields[3].GetString().c_str());
+                    TC_LOG_ERROR("realmlist", "Could not resolve address %s", fields[3].GetString().c_str());
                     continue;
                 }
 
@@ -159,7 +158,7 @@ void RealmList::UpdateRealms(boost::system::error_code const& error)
                 endPoint = _resolver->resolve(localSubmaskQuery, ec);
                 if (endPoint == end || ec)
                 {
-                    TC_LOG_ERROR("server.bnetserver", "Could not resolve address %s", fields[4].GetString().c_str());
+                    TC_LOG_ERROR("realmlist", "Could not resolve address %s", fields[4].GetString().c_str());
                     continue;
                 }
 
@@ -181,11 +180,11 @@ void RealmList::UpdateRealms(boost::system::error_code const& error)
                 UpdateRealm(id, name, externalAddress, localAddress, localSubmask, port, icon, flag, timezone,
                     (allowedSecurityLevel <= SEC_ADMINISTRATOR ? AccountTypes(allowedSecurityLevel) : SEC_ADMINISTRATOR), pop);
 
-                //TC_LOG_INFO("server.bnetserver", "Added realm \"%s\" at %s:%u.", name.c_str(), m_realms[id].ExternalAddress.to_string().c_str(), port);
+                TC_LOG_TRACE("realmlist", "Realm \"%s\" at %s:%u.", name.c_str(), externalAddress.to_string().c_str(), port);
             }
             catch (std::exception& ex)
             {
-                TC_LOG_ERROR("server.bnetserver", "Realmlist::UpdateRealms has thrown an exception: %s", ex.what());
+                TC_LOG_ERROR("realmlist", "Realmlist::UpdateRealms has thrown an exception: %s", ex.what());
                 ASSERT(false);
             }
         }
@@ -195,12 +194,15 @@ void RealmList::UpdateRealms(boost::system::error_code const& error)
     std::vector<Realm const*> updatedRealms;
     std::vector<Battlenet::RealmId> deletedRealms;
 
-    for (RealmMap::value_type const& pair : _realms)
+    for (RealmMap::value_type& pair : _realms)
     {
         if (pair.second.Updated)
             updatedRealms.push_back(&pair.second);
-        if (!pair.second.Keep)
+        else if (!pair.second.Keep)
             deletedRealms.push_back(pair.first);
+
+        pair.second.Updated = false;
+        pair.second.Keep = false;
     }
 
     for (Battlenet::RealmId const& deleted : deletedRealms)