commit a098a37acf7462ec9e9f4417751089b290291b25
author Brad Bishop <bradleyb@fuzziesquirrel.com> Thu May 05 15:19:04 2022 -0400
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Tue May 31 21:05:30 2022 -0400
tree ee8ca78c34a4e5ad9d5827d26cf921f6541b054b
parent f944a4507cbcaf37d8f266b600967b633fa09c70

style: comply with OpenBMC style guidelines

Change-Id: I72f86c59a0502777c861de901907c0a556c4c6c5
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

fail-monitor/monitor.cpp

diff --git a/fail-monitor/monitor.cpp b/fail-monitor/monitor.cpp
index 6c46558..97316c9 100644
--- a/fail-monitor/monitor.cpp
+++ b/fail-monitor/monitor.cpp
@@ -26,15 +26,15 @@
 
 using namespace phosphor::logging;
 
-constexpr auto FAILED_STATE = "failed";
-constexpr auto START_METHOD = "StartUnit";
-constexpr auto STOP_METHOD = "StopUnit";
+constexpr auto failedState = "failed";
+constexpr auto startMethod = "StartUnit";
+constexpr auto stopMethod = "StopUnit";
 
-constexpr auto SYSTEMD_SERVICE = "org.freedesktop.systemd1";
-constexpr auto SYSTEMD_OBJ_PATH = "/org/freedesktop/systemd1";
-constexpr auto SYSTEMD_INTERFACE = "org.freedesktop.systemd1.Manager";
-constexpr auto SYSTEMD_PROPERTY_INTERFACE = "org.freedesktop.DBus.Properties";
-constexpr auto SYSTEMD_UNIT_INTERFACE = "org.freedesktop.systemd1.Unit";
+constexpr auto systemdService = "org.freedesktop.systemd1";
+constexpr auto systemdObjPath = "/org/freedesktop/systemd1";
+constexpr auto systemdInterface = "org.freedesktop.systemd1.Manager";
+constexpr auto systemdPropertyInterface = "org.freedesktop.DBus.Properties";
+constexpr auto systemdUnitInterface = "org.freedesktop.systemd1.Unit";
 
 void Monitor::analyze()
 {
@@ -48,10 +48,10 @@
 {
     std::variant<std::string> property;
 
-    auto method = bus.new_method_call(SYSTEMD_SERVICE, path.c_str(),
-                                      SYSTEMD_PROPERTY_INTERFACE, "Get");
+    auto method = bus.new_method_call(systemdService, path.c_str(),
+                                      systemdPropertyInterface, "Get");
 
-    method.append(SYSTEMD_UNIT_INTERFACE, "ActiveState");
+    method.append(systemdUnitInterface, "ActiveState");
 
     auto reply = bus.call(method);
     if (reply.is_method_error())
@@ -65,15 +65,15 @@
     reply.read(property);
 
     auto value = std::get<std::string>(property);
-    return (value == FAILED_STATE);
+    return (value == failedState);
 }
 
 std::string Monitor::getSourceUnitPath()
 {
     sdbusplus::message::object_path path;
 
-    auto method = bus.new_method_call(SYSTEMD_SERVICE, SYSTEMD_OBJ_PATH,
-                                      SYSTEMD_INTERFACE, "GetUnit");
+    auto method = bus.new_method_call(systemdService, systemdObjPath,
+                                      systemdInterface, "GetUnit");
     method.append(source);
     auto reply = bus.call(method);
 
@@ -93,7 +93,7 @@
 void Monitor::runTargetAction()
 {
     // Start or stop the target unit
-    auto methodCall = (action == Action::start) ? START_METHOD : STOP_METHOD;
+    auto methodCall = (action == Action::start) ? startMethod : stopMethod;
 
     log<level::INFO>("The source unit is in failed state, "
                      "running target action",
@@ -101,8 +101,8 @@
                      entry("TARGET=%s", target.c_str()),
                      entry("ACTION=%s", methodCall));
 
-    auto method = this->bus.new_method_call(SYSTEMD_SERVICE, SYSTEMD_OBJ_PATH,
-                                            SYSTEMD_INTERFACE, methodCall);
+    auto method = this->bus.new_method_call(systemdService, systemdObjPath,
+                                            systemdInterface, methodCall);
     method.append(target);
     method.append("replace");