ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: log failures if a service cannot start during class_start"

Browse source 
am: 533fbd62ab

Change-Id: I7a05ae9f806a23d04d649fb230e2875633b2caee
This commit is contained in:
Tom Cherry 2017-10-03 22:42:51 +00:00 • committed by android-build-merger
commit 5c00898944
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
init/builtins.cpp
View file

@ -99,7 +99,14 @@ static void ForEachServiceInClass(const std::string& classname, F function) {
static Result<Success> do_class_start(const BuiltinArguments& args) { static Result<Success> do_class_start(const BuiltinArguments& args) {
// Starting a class does not start services which are explicitly disabled. // Starting a class does not start services which are explicitly disabled.
// They must be started individually. // They must be started individually.
ForEachServiceInClass(args[1], &Service::StartIfNotDisabled); for (const auto& service : ServiceList::GetInstance()) {
if (service->classnames().count(args[1])) {
if (auto result = service->StartIfNotDisabled(); !result) {
LOG(ERROR) << "Could not start service '" << service->name()
<< "' as part of class '" << args[1] << "': " << result.error();
}
}
}
return Success(); return Success();
} }