diff --git a/libprocessgroup/task_profiles.cpp b/libprocessgroup/task_profiles.cpp index 13113063d..8d4ce2545 100644 --- a/libprocessgroup/task_profiles.cpp +++ b/libprocessgroup/task_profiles.cpp @@ -273,7 +273,7 @@ bool WriteFileAction::ExecuteForProcess(uid_t uid, pid_t pid) const { value = StringReplace(value, "", 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, "", 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(attr_filepath, attr_value)); + const Json::Value& logfailures = params_val["LogFailures"]; + bool attr_logfailures = logfailures.isNull() || logfailures.asBool(); + profile->Add(std::make_unique(attr_filepath, attr_value, + attr_logfailures)); } else if (attr_filepath.empty()) { LOG(WARNING) << "WriteFile: invalid parameter: " << "empty filepath"; diff --git a/libprocessgroup/task_profiles.h b/libprocessgroup/task_profiles.h index 98bcb0ea7..25a84b0c1 100644 --- a/libprocessgroup/task_profiles.h +++ b/libprocessgroup/task_profiles.h @@ -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 {