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

Merge "init: -1 log for control message error paths."

Browse source
This commit is contained in:
Treehugger Robot 2019-08-29 17:53:47 +00:00 • committed by Gerrit Code Review
commit b4eedd9ccd
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
init/init.cpp
View file

@ -305,9 +305,6 @@ bool HandleControlMessage(const std::string& msg, const std::string& name, pid_t
process_cmdline = "unknown process";
}
LOG(INFO) << "Received control message '" << msg << "' for '" << name << "' from pid: " << pid
<< " (" << process_cmdline << ")";
const ControlMessageFunction& function = it->second;
Service* svc = nullptr;
@ -320,20 +317,25 @@ bool HandleControlMessage(const std::string& msg, const std::string& name, pid_t
svc = ServiceList::GetInstance().FindInterface(name);
break;
default:
LOG(ERROR) << "Invalid function target from static map key '" << msg << "': "
LOG(ERROR) << "Invalid function target from static map key ctl." << msg << ": "
<< static_cast<std::underlying_type<ControlTarget>::type>(function.target);
return false;
}
if (svc == nullptr) {
LOG(ERROR) << "Could not find '" << name << "' for ctl." << msg;
LOG(ERROR) << "Control message: Could not find '" << name << "' for ctl." << msg
<< " from pid: " << pid << " (" << process_cmdline << ")";
return false;
}
if (auto result = function.action(svc); !result) {
LOG(ERROR) << "Could not ctl." << msg << " for '" << name << "': " << result.error();
LOG(ERROR) << "Control message: Could not ctl." << msg << " for '" << name
<< "' from pid: " << pid << " (" << process_cmdline << "): " << result.error();
return false;
}
LOG(INFO) << "Control message: Processed ctl." << msg << " for '" << name
<< "' from pid: " << pid << " (" << process_cmdline << ")";
return true;
}