commit 2885ba902c96d56c8aed17a28c054bc3519dc8d8
author Matthew Barth <msbarth@us.ibm.com> Wed Nov 14 15:03:05 2018 -0600
committer Matthew Barth <msbarth@us.ibm.com> Tue Jun 11 10:54:04 2019 -0500
tree be3e12ac11f74cf4d8359a86f5d32d2271adefc7
parent 621a5778f0904572d98c5dd0ac011276c9ae21b7

Provide event name to triggers

Change-Id: Iec063b39a3e3e6a63038a2013f42e8a69ad9fadf
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>

control/triggers.cpp

diff --git a/control/triggers.cpp b/control/triggers.cpp
index 5662f3f..410732d 100644
--- a/control/triggers.cpp
+++ b/control/triggers.cpp
@@ -14,6 +14,7 @@
 Trigger timer(TimerConf&& tConf)
 {
     return [tConf = std::move(tConf)](control::Zone& zone,
+                                      const std::string& name,
                                       const Group& group,
                                       const std::vector<Action>& actions)
     {
@@ -27,6 +28,7 @@
 {
     return [match = std::move(match),
             handler = std::move(handler)](control::Zone& zone,
+                                          const std::string& name,
                                           const Group& group,
                                           const std::vector<Action>& actions)
     {
@@ -80,6 +82,7 @@
 Trigger init(MethodHandler&& handler)
 {
     return [handler = std::move(handler)](control::Zone& zone,
+                                          const std::string& name,
                                           const Group& group,
                                           const std::vector<Action>& actions)
     {

control/types.hpp

diff --git a/control/types.hpp b/control/types.hpp
index 55be27d..4c3bec2 100644
--- a/control/types.hpp
+++ b/control/types.hpp
@@ -55,6 +55,7 @@
 using MethodHandler = std::function<void(Zone&, const Group&)>;
 using Action = std::function<void(Zone&, const Group&)>;
 using Trigger = std::function<void(Zone&,
+                                   const std::string&,
                                    const Group&,
                                    const std::vector<Action>&)>;
 

control/zone.cpp

diff --git a/control/zone.cpp b/control/zone.cpp
index fc0f6f4..3a0b48b 100644
--- a/control/zone.cpp
+++ b/control/zone.cpp
@@ -326,6 +326,7 @@
         [this, &event](auto const& trigger)
         {
             trigger(*this,
+                    std::get<sseNamePos>(event),
                     std::get<groupPos>(event),
                     std::get<actionsPos>(event));
         }