mgr/DaemonState: avoid searching for a daemon state twice

and less repeating this way

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/mgr/ActivePyModules.cc b/src/mgr/ActivePyModules.cc
index 9f928cea7668d5227e3b1e704363384ca8f8058b..a7fc09407673c457a0f0a2c45347978f13c5a9a1 100644 (file)
--- a/src/mgr/ActivePyModules.cc
+++ b/src/mgr/ActivePyModules.cc
@@ -153,7 +153,7 @@ PyObject *ActivePyModules::get_daemon_status_python(
 
   std::lock_guard l(metadata->lock);
   PyFormatter f;
-  for (const auto &[daemon, status] : metadataz->service_status) {
+  for (const auto &[daemon, status] : metadata->service_status) {
     f.dump_string(daemon, status);
   }
   return f.get();

diff --git a/src/mgr/DaemonState.cc b/src/mgr/DaemonState.cc
index 87f820bffb7dfdec8e09dec6454fecbeff3f35f4..07d5854179905b5f10c80cfb278dbc5e209c0fb1 100644 (file)
--- a/src/mgr/DaemonState.cc
+++ b/src/mgr/DaemonState.cc
@@ -216,8 +216,8 @@ DaemonStateCollection DaemonStateIndex::get_by_server(
 {
   std::shared_lock l{lock};
 
-  if (by_server.count(hostname)) {
-    return by_server.at(hostname);
+  if (auto found = by_server.find(hostname); found != by_server.end()) {
+    return found->second;
   } else {
     return {};
   }