Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f85f4d6a authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

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

Merge "init: log failures if a service cannot start during class_start" am: 533fbd62 am: 5c008989
am: d1721a99

Change-Id: I5c3849ef95de0e68a0707b5ee3f259efc4966c8e
parents d59c04eb d1721a99

init/builtins.cpp

+8 −1
Original line number Diff line number Diff line
@@ -99,7 +99,14 @@ static void ForEachServiceInClass(const std::string& classname, F function) { 
static Result<Success> do_class_start(const BuiltinArguments& args) {

    // Starting a class does not start services which are explicitly disabled.

    // 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();

}