update ceph source to reef 18.2.1

[ceph.git] / ceph / src / rgw / rgw_env.cc

diff --git a/ceph/src/rgw/rgw_env.cc b/ceph/src/rgw/rgw_env.cc
index bb45ee8d36aa18d231f1d30a13db2d0c36421bf9..d528f0e6d479a85b8e8f63897904d2ccf94c5a4d 100644 (file)
--- a/ceph/src/rgw/rgw_env.cc
+++ b/ceph/src/rgw/rgw_env.cc
@@ -52,11 +52,26 @@ const char *rgw_conf_get(const map<string, string, ltstr_nocase>& conf_map, cons
   return iter->second.c_str();
 }
 
+boost::optional<const std::string&> rgw_conf_get_optional(const map<string, string, ltstr_nocase>& conf_map, const std::string& name)
+{
+  auto iter = conf_map.find(name);
+  if (iter == conf_map.end())
+    return boost::none;
+
+  return boost::optional<const std::string&>(iter->second);
+}
+
 const char *RGWEnv::get(const char *name, const char *def_val) const
 {
   return rgw_conf_get(env_map, name, def_val);
 }
 
+boost::optional<const std::string&>
+RGWEnv::get_optional(const std::string& name) const
+{
+  return rgw_conf_get_optional(env_map, name);
+}
+
 int rgw_conf_get_int(const map<string, string, ltstr_nocase>& conf_map, const char *name, int def_val)
 {
   auto iter = conf_map.find(name);