diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-01-08 21:16:53 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-01-08 21:16:53 +0100 |
| commit | d791afae1dfcfaf592326f787755ca32d629e4d3 (patch) | |
| tree | 54dc9916ede5800e110a2f0edff91530811fbdb8 /src/server/shared/Realm | |
| parent | b6820a706f46f18b9652fcd9806e4bec8805d29d (diff) | |
Core/Logging: Switch from fmt::sprintf to fmt::format (c++20 standard compatible api)
Diffstat (limited to 'src/server/shared/Realm')
| -rw-r--r-- | src/server/shared/Realm/Realm.cpp | 4 | ||||
| -rw-r--r-- | src/server/shared/Realm/RealmList.cpp | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/server/shared/Realm/Realm.cpp b/src/server/shared/Realm/Realm.cpp index f137cd573de..0648de535a3 100644 --- a/src/server/shared/Realm/Realm.cpp +++ b/src/server/shared/Realm/Realm.cpp @@ -70,10 +70,10 @@ uint32 const Realm::ConfigIdByType[MAX_CLIENT_REALM_TYPE] = std::string Battlenet::RealmHandle::GetAddressString() const { - return Trinity::StringFormat("%u-%u-%u", Region, Site, Realm); + return Trinity::StringFormat("{}-{}-{}", Region, Site, Realm); } std::string Battlenet::RealmHandle::GetSubRegionAddress() const { - return Trinity::StringFormat("%u-%u-0", Region, Site); + return Trinity::StringFormat("{}-{}-0", Region, Site); } diff --git a/src/server/shared/Realm/RealmList.cpp b/src/server/shared/Realm/RealmList.cpp index 4442857dc3d..361e87872e2 100644 --- a/src/server/shared/Realm/RealmList.cpp +++ b/src/server/shared/Realm/RealmList.cpp @@ -149,21 +149,21 @@ void RealmList::UpdateRealms(boost::system::error_code const& error) Optional<boost::asio::ip::tcp::endpoint> externalAddress = _resolver->Resolve(boost::asio::ip::tcp::v4(), externalAddressString, ""); if (!externalAddress) { - TC_LOG_ERROR("realmlist", "Could not resolve address %s for realm \"%s\" id %u", externalAddressString.c_str(), name.c_str(), realmId); + TC_LOG_ERROR("realmlist", "Could not resolve address {} for realm \"{}\" id {}", externalAddressString, name, realmId); continue; } Optional<boost::asio::ip::tcp::endpoint> localAddress = _resolver->Resolve(boost::asio::ip::tcp::v4(), localAddressString, ""); if (!localAddress) { - TC_LOG_ERROR("realmlist", "Could not resolve localAddress %s for realm \"%s\" id %u", localAddressString.c_str(), name.c_str(), realmId); + TC_LOG_ERROR("realmlist", "Could not resolve localAddress {} for realm \"{}\" id {}", localAddressString, name, realmId); continue; } Optional<boost::asio::ip::tcp::endpoint> localSubmask = _resolver->Resolve(boost::asio::ip::tcp::v4(), localSubmaskString, ""); if (!localSubmask) { - TC_LOG_ERROR("realmlist", "Could not resolve localSubnetMask %s for realm \"%s\" id %u", localSubmaskString.c_str(), name.c_str(), realmId); + TC_LOG_ERROR("realmlist", "Could not resolve localSubnetMask {} for realm \"{}\" id {}", localSubmaskString, name, realmId); continue; } @@ -189,15 +189,15 @@ void RealmList::UpdateRealms(boost::system::error_code const& error) newSubRegions.insert(Battlenet::RealmHandle{ region, battlegroup, 0 }.GetAddressString()); if (!existingRealms.count(id)) - TC_LOG_INFO("realmlist", "Added realm \"%s\" at %s:%u.", name.c_str(), externalAddressString.c_str(), port); + TC_LOG_INFO("realmlist", "Added realm \"{}\" at {}:{}.", name, externalAddressString, port); else - TC_LOG_DEBUG("realmlist", "Updating realm \"%s\" at %s:%u.", name.c_str(), externalAddressString.c_str(), port); + TC_LOG_DEBUG("realmlist", "Updating realm \"{}\" at {}:{}.", name, externalAddressString, port); existingRealms.erase(id); } catch (std::exception& ex) { - TC_LOG_ERROR("realmlist", "Realmlist::UpdateRealms has thrown an exception: %s", ex.what()); + TC_LOG_ERROR("realmlist", "Realmlist::UpdateRealms has thrown an exception: {}", ex.what()); ABORT(); } } @@ -205,7 +205,7 @@ void RealmList::UpdateRealms(boost::system::error_code const& error) } for (auto itr = existingRealms.begin(); itr != existingRealms.end(); ++itr) - TC_LOG_INFO("realmlist", "Removed realm \"%s\".", itr->second.c_str()); + TC_LOG_INFO("realmlist", "Removed realm \"{}\".", itr->second); { std::unique_lock<std::shared_mutex> lock(_realmsMutex); |
