From 3cfe77ae758d02a969831180fa3100d269237343 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 26 Apr 2018 19:17:35 -0400 Subject: common: Move logging macros over to new fmt-capable macros where applicable --- src/common/param_package.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/common/param_package.cpp') diff --git a/src/common/param_package.cpp b/src/common/param_package.cpp index 3a6ef8c27..ab0154133 100644 --- a/src/common/param_package.cpp +++ b/src/common/param_package.cpp @@ -25,7 +25,7 @@ ParamPackage::ParamPackage(const std::string& serialized) { std::vector key_value; Common::SplitString(pair, KEY_VALUE_SEPARATOR, key_value); if (key_value.size() != 2) { - LOG_ERROR(Common, "invalid key pair %s", pair.c_str()); + NGLOG_ERROR(Common, "invalid key pair {}", pair); continue; } @@ -64,7 +64,7 @@ std::string ParamPackage::Serialize() const { std::string ParamPackage::Get(const std::string& key, const std::string& default_value) const { auto pair = data.find(key); if (pair == data.end()) { - LOG_DEBUG(Common, "key %s not found", key.c_str()); + NGLOG_DEBUG(Common, "key '{}' not found", key); return default_value; } @@ -74,14 +74,14 @@ std::string ParamPackage::Get(const std::string& key, const std::string& default int ParamPackage::Get(const std::string& key, int default_value) const { auto pair = data.find(key); if (pair == data.end()) { - LOG_DEBUG(Common, "key %s not found", key.c_str()); + NGLOG_DEBUG(Common, "key '{}' not found", key); return default_value; } try { return std::stoi(pair->second); } catch (const std::logic_error&) { - LOG_ERROR(Common, "failed to convert %s to int", pair->second.c_str()); + NGLOG_ERROR(Common, "failed to convert {} to int", pair->second); return default_value; } } @@ -89,14 +89,14 @@ int ParamPackage::Get(const std::string& key, int default_value) const { float ParamPackage::Get(const std::string& key, float default_value) const { auto pair = data.find(key); if (pair == data.end()) { - LOG_DEBUG(Common, "key %s not found", key.c_str()); + NGLOG_DEBUG(Common, "key {} not found", key); return default_value; } try { return std::stof(pair->second); } catch (const std::logic_error&) { - LOG_ERROR(Common, "failed to convert %s to float", pair->second.c_str()); + NGLOG_ERROR(Common, "failed to convert {} to float", pair->second); return default_value; } } -- cgit v1.2.3