commit 9cbf57048cf0057f499bf1911e4ac3eba795becb
author Tom Cherry <tomcherry@google.com> Tue Feb 13 16:24:51 2018 -0800
committer Tom Cherry <tomcherry@google.com> Wed Feb 14 16:37:17 2018 -0800
tree d35ece56762c71f178792237b1441f0592042233
parent 7fd3bc27eccdcb11de4886bdda05cd26a8d8af5c

Move all Action parsing into ActionParser

Bug: 36970783
Test: Build
Change-Id: Iea2d97fb45c3e88bc83fb72d6fa67049be42cfa9

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index a4e33f7..7454a34 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -189,7 +189,8 @@
       capabilities_(capabilities),
       namespace_flags_(namespace_flags),
       seclabel_(seclabel),
-      onrestart_(false, subcontext_for_restart_commands, "<Service '" + name + "' onrestart>", 0),
+      onrestart_(false, subcontext_for_restart_commands, "<Service '" + name + "' onrestart>", 0,
+                 "onrestart", {}),
       keychord_id_(0),
       ioprio_class_(IoSchedClass_NONE),
       ioprio_pri_(0),
@@ -199,9 +200,7 @@
       soft_limit_in_bytes_(-1),
       limit_in_bytes_(-1),
       start_order_(0),
-      args_(args) {
-    onrestart_.InitSingleTrigger("onrestart");
-}
+      args_(args) {}
 
 void Service::NotifyStateChange(const std::string& new_state) const {
     if ((flags_ & SVC_TEMPORARY) != 0) {