rgw/main: move service_map_meta into AppMain

The RGWRealmReloader holds a reference on it.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

diff --git a/src/rgw/rgw_appmain.cc b/src/rgw/rgw_appmain.cc
index 66867636a110be7a25c43aab0c9c4b0160771362..95d3ee18526cf411a532ca782a777fb640aba622 100644 (file)
--- a/src/rgw/rgw_appmain.cc
+++ b/src/rgw/rgw_appmain.cc
@@ -381,7 +381,6 @@ int rgw::AppMain::init_frontends2(RGWLib* rgwlib)
     g_conf().get_val<string>("rgw_frontend_defaults");
   get_str_vec(frontend_defs_str, ",", frontends_def);
 
-  std::map<std::string, std::string> service_map_meta;
   service_map_meta["pid"] = stringify(getpid());
 
   std::map<std::string, std::unique_ptr<RGWFrontendConfig> > fe_def_map;

diff --git a/src/rgw/rgw_main.h b/src/rgw/rgw_main.h
index 3acd1198c7d24f383807828543ada755941c9b82..bcd45badf66bcff6453c290459e88d28a02bc989 100644 (file)
--- a/src/rgw/rgw_main.h
+++ b/src/rgw/rgw_main.h
@@ -68,6 +68,7 @@ class AppMain {
   std::unique_ptr<rgw::auth::ImplicitTenants> implicit_tenant_context;
   std::unique_ptr<rgw::dmclock::SchedulerCtx> sched_ctx;
   std::unique_ptr<ActiveRateLimiter> ratelimiter;
+  std::map<std::string, std::string> service_map_meta;
   // wow, realm reloader has a lot of parts
   std::unique_ptr<RGWRealmReloader> reloader;
   std::unique_ptr<RGWPeriodPusher> pusher;