tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: 9bde0dc769

Change-Id: Ibb27338bb694482108ffc558b2823c583a9701d3
This commit is contained in:
Tom Cherry 2017-08-28 17:30:28 +00:00 committed by android-build-merger
commit 849b481786
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
init/init.cpp
View file

@ -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") {

7
init/keychords.cpp
View file

@ -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";
}

11
init/reboot.cpp
View file

@ -374,10 +374,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();
}
}
}