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

libprocessgroup: Add control of printing log in WriteFileAction

Browse source 
If there are known fail pattern, we could disable printing logs to
reduce log spam. Use "LogFailures": true or "LogFailures": false.
Default will be true if not specified.

Bug: 178070122
Test: function works
Change-Id: Ia4081a10daf738294937f459f006fbcc3171481b
This commit is contained in:
Rick Yiu 2021-01-25 12:44:45 +08:00
parent b9c7459fba
commit d76053a4c5
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libprocessgroup/task_profiles.cpp
View file

@ -273,7 +273,7 @@ bool WriteFileAction::ExecuteForProcess(uid_t uid, pid_t pid) const {
value = StringReplace(value, "<pid>", std::to_string(pid), true);
if (!WriteStringToFile(value, filepath)) {
PLOG(ERROR) << "Failed to write '" << value << "' to " << filepath;
if (logfailures_) PLOG(ERROR) << "Failed to write '" << value << "' to " << filepath;
return false;
}
@ -290,7 +290,7 @@ bool WriteFileAction::ExecuteForTask(int tid) const {
value = StringReplace(value, "<pid>", std::to_string(tid), true);
if (!WriteStringToFile(value, filepath)) {
PLOG(ERROR) << "Failed to write '" << value << "' to " << filepath;
if (logfailures_) PLOG(ERROR) << "Failed to write '" << value << "' to " << filepath;
return false;
}
@ -516,7 +516,10 @@ bool TaskProfiles::Load(const CgroupMap& cg_map, const std::string& file_name) {
std::string attr_filepath = params_val["FilePath"].asString();
std::string attr_value = params_val["Value"].asString();
if (!attr_filepath.empty() && !attr_value.empty()) {
profile->Add(std::make_unique<WriteFileAction>(attr_filepath, attr_value));
const Json::Value& logfailures = params_val["LogFailures"];
bool attr_logfailures = logfailures.isNull() || logfailures.asBool();
profile->Add(std::make_unique<WriteFileAction>(attr_filepath, attr_value,
attr_logfailures));
} else if (attr_filepath.empty()) {
LOG(WARNING) << "WriteFile: invalid parameter: "
<< "empty filepath";

6
libprocessgroup/task_profiles.h
View file

@ -142,14 +142,16 @@ class SetCgroupAction : public ProfileAction {
// Write to file action
class WriteFileAction : public ProfileAction {
public:
WriteFileAction(const std::string& filepath, const std::string& value) noexcept
: filepath_(filepath), value_(value) {}
WriteFileAction(const std::string& filepath, const std::string& value,
bool logfailures) noexcept
: filepath_(filepath), value_(value), logfailures_(logfailures) {}
virtual bool ExecuteForProcess(uid_t uid, pid_t pid) const;
virtual bool ExecuteForTask(int tid) const;
private:
std::string filepath_, value_;
bool logfailures_;
};
class TaskProfile {