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

Commit 702ca9ad authored by Tom Cherry's avatar Tom Cherry
Browse files

init: log all failures of Service::Start() 

The move to returning Result from Service::Start() for better context
when starting process through init's builtins stops Service::Start()
failures from being logged from other contexts.  This change adds
those logs along with their context.

Test: boot bullhead, fail to start services via `setprop ctl.start`,
      see the expected error in dmesg

Change-Id: I45294f6abf00852f3d4c549a32eaf4920a51e6f0
parent 2732a7e0

init/init.cpp

+6 −2
Original line number Diff line number Diff line
@@ -177,7 +177,9 @@ static std::optional<boot_clock::time_point> RestartProcesses() { 


        auto restart_time = s->time_started() + 5s;

        if (boot_clock::now() > restart_time) {

            s->Start();

            if (auto result = s->Start(); !result) {

                LOG(ERROR) << "Could not restart process '" << s->name() << "': " << result.error();

            }

        } else {

            if (!next_process_restart_time || restart_time < *next_process_restart_time) {

                next_process_restart_time = restart_time;
@@ -195,7 +197,9 @@ void handle_control_message(const std::string& msg, const std::string& name) { 
    }



    if (msg == "start") {

        svc->Start();

        if (auto result = svc->Start(); !result) {

            LOG(ERROR) << "Could not ctl.start service '" << name << "': " << result.error();

        }

    } else if (msg == "stop") {

        svc->Stop();

    } else if (msg == "restart") {

init/keychords.cpp

+5 −2
Original line number Diff line number Diff line
@@ -81,8 +81,11 @@ static void handle_keychord() { 
    if (adb_enabled == "running") {

        Service* svc = ServiceList::GetInstance().FindService(id, &Service::keychord_id);

        if (svc) {

            LOG(INFO) << "Starting service " << svc->name() << " from keychord " << id;

            svc->Start();

            LOG(INFO) << "Starting service '" << svc->name() << "' from keychord " << id;

            if (auto result = svc->Start(); !result) {

                LOG(ERROR) << "Could not start service '" << svc->name() << "' from keychord " << id

                           << ": " << result.error();

            }

        } else {

            LOG(ERROR) << "Service for keychord " << id << " not found";

        }

init/reboot.cpp

+9 −2
Original line number Diff line number Diff line
@@ -378,10 +378,17 @@ void DoReboot(unsigned int cmd, const std::string& reason, const std::string& re 
        if (kill_after_apps.count(s->name())) {

            s->SetShutdownCritical();

        } else if (to_starts.count(s->name())) {

            s->Start();

            if (auto result = s->Start(); !result) {

                LOG(ERROR) << "Could not start shutdown 'to_start' service '" << s->name()

                           << "': " << result.error();

            }

            s->SetShutdownCritical();

        } else if (s->IsShutdownCritical()) {

            s->Start();  // start shutdown critical service if not started

            // Start shutdown critical service if not started.

            if (auto result = s->Start(); !result) {

                LOG(ERROR) << "Could not start shutdown critical service '" << s->name()

                           << "': " << result.error();

            }

        }

    }