control: Add event name to the action unique name
The unique name of an action was previously just <action name>-ID, where
ID was unique number. When there are multiple instances of an action,
it can be difficult to tell which action is being referred to when it
shows up in the fan control dump in either the flight recorder or zones
section.
To fix this, add the name of the owning event to the action's name so
now it's <action name>-ID(event name). Here is an example from the fan
control dump now:
"floor_holds": {
"count_state_floor-4(Non-active OCCs)": 18000,
"mapped_floor-64(Fan floors)": 11200
}
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I879e05a05da50545319635e82cc9a2d9ebac6b82
diff --git a/control/json/event.cpp b/control/json/event.cpp
index a1392e5..0f9ab8a 100644
--- a/control/json/event.cpp
+++ b/control/json/event.cpp
@@ -243,6 +243,7 @@
std::move(actionGroups), std::move(actionZones));
if (actObj)
{
+ actObj->setEventName(_name);
_actions.emplace_back(std::move(actObj));
}
}
@@ -254,6 +255,7 @@
std::move(actionZones));
if (actObj)
{
+ actObj->setEventName(_name);
_actions.emplace_back(std::move(actObj));
}
}