1 files changed, 39 insertions, 33 deletions
diff --git a/src/common/Configuration/Config.cpp b/src/common/Configuration/Config.cpp
index 71c0f1df100..919c49f72b9 100644
--- a/src/common/Configuration/Config.cpp
+++ b/src/common/Configuration/Config.cpp
@@ -69,64 +69,70 @@ bool ConfigMgr::Reload(std::string& error)
     return LoadInitial(_filename, error);
 }
 
-std::string ConfigMgr::GetStringDefault(std::string const& name, const std::string& def) const
+template<class T>
+T ConfigMgr::GetValueDefault(std::string const& name, T def) const
 {
     try
     {
-        std::string value = _config.get<std::string>(ptree::path_type(name, '/'));
-        value.erase(std::remove(value.begin(), value.end(), '"'), value.end());
-        return value;
+        return _config.get<T>(ptree::path_type(name, '/'));
     }
     catch (boost::property_tree::ptree_bad_path)
     {
         TC_LOG_WARN("server.loading", "Missing name %s in config file %s, add \"%s = %s\" to this file",
-            name.c_str(), _filename.c_str(), name.c_str(), def.c_str());
-        return def;
+            name.c_str(), _filename.c_str(), name.c_str(), std::to_string(def).c_str());
+    }
+    catch (boost::property_tree::ptree_bad_data)
+    {
+        TC_LOG_ERROR("server.loading", "Bad value defined for name %s in config file %s, going to use %s instead",
+            name.c_str(), _filename.c_str(), std::to_string(def).c_str());
     }
+
+    return def;
 }
 
-bool ConfigMgr::GetBoolDefault(std::string const& name, bool def) const
+template<>
+std::string ConfigMgr::GetValueDefault<std::string>(std::string const& name, std::string def) const
 {
     try
     {
-        std::string val = _config.get<std::string>(ptree::path_type(name, '/'));
-        val.erase(std::remove(val.begin(), val.end(), '"'), val.end());
-        return (val == "true" || val == "TRUE" || val == "yes" || val == "YES" || val == "1");
+        return _config.get<std::string>(ptree::path_type(name, '/'));
     }
     catch (boost::property_tree::ptree_bad_path)
     {
-        TC_LOG_WARN("server.loading", "Missing name %s in config file %s, add \"%s = %d\" to this file",
-            name.c_str(), _filename.c_str(), name.c_str(), def ? 1 : 0);
-        return def;
+        TC_LOG_WARN("server.loading", "Missing name %s in config file %s, add \"%s = %s\" to this file",
+            name.c_str(), _filename.c_str(), name.c_str(), def.c_str());
+    }
+    catch (boost::property_tree::ptree_bad_data)
+    {
+        TC_LOG_ERROR("server.loading", "Bad value defined for name %s in config file %s, going to use %s instead",
+            name.c_str(), _filename.c_str(), def.c_str());
     }
+
+    return def;
+}
+
+std::string ConfigMgr::GetStringDefault(std::string const& name, const std::string& def) const
+{
+    std::string val = GetValueDefault(name, def);
+    val.erase(std::remove(val.begin(), val.end(), '"'), val.end());
+    return val;
+}
+
+bool ConfigMgr::GetBoolDefault(std::string const& name, bool def) const
+{
+    std::string val = GetValueDefault(name, std::string(def ? "1" : "0"));
+    val.erase(std::remove(val.begin(), val.end(), '"'), val.end());
+    return (val == "true" || val == "TRUE" || val == "yes" || val == "YES" || val == "1");
 }
 
 int ConfigMgr::GetIntDefault(std::string const& name, int def) const
 {
-    try
-    {
-        return _config.get<int>(ptree::path_type(name, '/'));
-    }
-    catch (boost::property_tree::ptree_bad_path)
-    {
-        TC_LOG_WARN("server.loading", "Missing name %s in config file %s, add \"%s = %d\" to this file",
-            name.c_str(), _filename.c_str(), name.c_str(), def);
-        return def;
-    }
+    return GetValueDefault(name, def);
 }
 
 float ConfigMgr::GetFloatDefault(std::string const& name, float def) const
 {
-    try
-    {
-        return _config.get<float>(ptree::path_type(name, '/'));
-    }
-    catch (boost::property_tree::ptree_bad_path)
-    {
-        TC_LOG_WARN("server.loading", "Missing name %s in config file %s, add \"%s = %f\" to this file",
-            name.c_str(), _filename.c_str(), name.c_str(), def);
-        return def;
-    }
+    return GetValueDefault(name, def);
 }
 
 std::string const& ConfigMgr::GetFilename()