Skip to content

Commit

Permalink
Remove unnecessary logging statements in ProcessInfo and ProcessTree …
Browse files Browse the repository at this point in the history 
…for cleaner output
  • Loading branch information
iritb committed Jan 5, 2025
1 parent 400690c commit 436ceef
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 32 deletions.
4 changes: 0 additions & 4 deletions ProcessInfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,23 +413,20 @@ int ProcessInfo::read_and_parse_cgroup(int pid) {
char *containerd_pos = strstr(ptr, containerd_prefix);
if (containerd_pos != nullptr && containerd_pos < line_end) {
_container_id = std::string(containerd_pos + containerd_prefix_len, 12); // Extract the first 12 characters of the container ID
Logger::Info("Read Container id (1) from cgroup for /proc/%d/cgroup: %s", pid, _container_id.c_str());
return 0;
}

// Check for Docker format
char *docker_pos = strstr(ptr, docker_prefix);
if (docker_pos != nullptr && docker_pos < line_end) {
_container_id = std::string(docker_pos + docker_prefix_len, 12); // Extract the first 12 characters of the container ID
Logger::Info("Read Container id (2) from cgroup for /proc/%d/cgroup: %s", pid, _container_id.c_str());
return 0;
}

// Check for system.slice Docker format
char *system_docker_pos = strstr(ptr, system_docker_prefix);
if (system_docker_pos != nullptr && system_docker_pos < line_end) {
_container_id = std::string(system_docker_pos + system_docker_prefix_len, 12); // Extract the first 12 characters of the container ID
Logger::Info("Read Container id (3) from cgroup for /proc/%d/cgroup: %s", pid, _container_id.c_str());
return 0;
}

Expand Down Expand Up @@ -460,7 +457,6 @@ bool ProcessInfo::read(int pid) {
return false;
}

Logger::Info("Read cgroup for %d", pid);
pret = read_and_parse_cgroup(pid);
if (pret != 0) {
if (pret > 0) {
Expand Down
26 changes: 1 addition & 25 deletions ProcessTree.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,9 +334,7 @@ std::shared_ptr<ProcessTreeItem> ProcessTree::AddProcess(enum ProcessTreeSource
std::unique_lock<std::mutex> process_write_lock(_process_write_mutex);
std::shared_ptr<ProcessTreeItem> process;

std::string containerid = ExtractContainerId(exe, cmdline);

Logger::Info("IB AddProcess: pid=%d containerId=%s cmdline=%s", pid, containerid.c_str(), cmdline.c_str());
std::string containerid = ExtractContainerId(exe, cmdline);

auto it = _processes.find(pid);
if (it != _processes.end()) {
Expand All @@ -349,7 +347,6 @@ std::shared_ptr<ProcessTreeItem> ProcessTree::AddProcess(enum ProcessTreeSource
process->_exe = exe;
process->_cmdline = cmdline;
process->_containeridfromhostprocess = containerid;
Logger::Info("1 IB _pid=%d, _containeridfromhostprocess=%s", process->_pid, process->_containeridfromhostprocess.c_str());
}
if (ppid != process->_ppid) {
auto it2 = _processes.find(process->_ppid);
Expand All @@ -371,9 +368,6 @@ std::shared_ptr<ProcessTreeItem> ProcessTree::AddProcess(enum ProcessTreeSource
} else {
process->_containerid = parentproc->_containerid;
}

Logger::Info("2 IB _pid=%d, _containerid=%s", process->_pid, process->_containerid.c_str());

}
process->_ancestors = parentproc->_ancestors;
struct Ancestor anc = {ppid, parentproc->_exe};
Expand Down Expand Up @@ -401,8 +395,6 @@ std::shared_ptr<ProcessTreeItem> ProcessTree::AddProcess(enum ProcessTreeSource
} else {
p->_containerid = process->_containerid;
}

Logger::Info("3 IB _pid=%d, _containerid=%s", process->_pid, process->_containerid.c_str());
}
p->_ancestors = process->_ancestors;
struct Ancestor anc = {pid, exe};
Expand All @@ -427,8 +419,6 @@ std::shared_ptr<ProcessTreeItem> ProcessTree::AddProcess(enum ProcessTreeSource
process->_containeridfromhostprocess = containerid;
process->_containerid = parentproc->_containerid;
}

Logger::Info("4 IB _pid=%d, _containerid=%s", process->_pid, process->_containerid.c_str());
}
process->_ancestors = parentproc->_ancestors;
struct Ancestor anc = {ppid, parentproc->_exe};
Expand All @@ -444,8 +434,6 @@ std::shared_ptr<ProcessTreeItem> ProcessTree::AddProcess(enum ProcessTreeSource
if (p_temp) {
process->_containerid = p_temp->_cgroupContainerId;
}

Logger::Info("5 IB _pid=%d, _containerid=%s", process->_pid, process->_containerid.c_str());
}

return process;
Expand Down Expand Up @@ -515,7 +503,6 @@ std::shared_ptr<ProcessTreeItem> ProcessTree::GetInfoForPid(int pid)
process->_containerid = parentproc->_containerid;
}

Logger::Info("6 IB _pid=%d, _containerid=%s", process->_pid, process->_containerid.c_str());
process->_ancestors = parentproc->_ancestors;
struct Ancestor anc = {process->_ppid, parentproc->_exe};
process->_ancestors.emplace_back(anc);
Expand Down Expand Up @@ -577,9 +564,6 @@ void ProcessTree::PopulateTree()
auto process = std::make_shared<ProcessTreeItem>(ProcessTreeSource_procfs, pid, ppid, uid, gid, exe, cmdline);
process->_containeridfromhostprocess = ExtractContainerId(exe, cmdline);
_processes[pid] = process;

Logger::Info("7 IB _pid=%d, _containeridfromhostprocess=%s", process->_pid, process->_containeridfromhostprocess.c_str());

}

for (auto& p : _processes) {
Expand Down Expand Up @@ -614,8 +598,6 @@ void ProcessTree::PopulateTree()
auto process = p.second;
if( !(process->_containeridfromhostprocess).empty()) {
SetContainerId(process, process->_containeridfromhostprocess);

Logger::Info("Populate containerid 8 IB _pid=%d, _containeridfromhostprocess=%s", process->_pid, process->_containeridfromhostprocess.c_str());
}
}
}
Expand Down Expand Up @@ -685,15 +667,11 @@ std::shared_ptr<ProcessTreeItem> ProcessTree::ReadProcEntry(int pid)
{
std::shared_ptr<ProcessTreeItem> process = std::make_shared<ProcessTreeItem>(ProcessTreeSource_procfs, pid);

Logger::Info("ReadProcEntry: IB pid=%d Before OpenPid", pid);

auto pinfo = ProcessInfo::OpenPid(pid, CMDLINE_SIZE_LIMIT);
if (!pinfo) {
return nullptr;
}

Logger::Info("ReadProcEntry: IB pid=%d After OpenPid", pid);

process->_uid = pinfo->uid();
process->_gid = pinfo->gid();
process->_ppid = pinfo->ppid();
Expand All @@ -702,8 +680,6 @@ std::shared_ptr<ProcessTreeItem> ProcessTree::ReadProcEntry(int pid)
pinfo->format_cmdline(process->_cmdline);
process->_containeridfromhostprocess = ExtractContainerId(process->_exe, process->_cmdline);

Logger::Info("ReadProcEntry: IB pid=%d _cgroupContainerId=%s _containeridfromhostprocess=%s", pid, process->_cgroupContainerId.c_str(), process->_containeridfromhostprocess.c_str());

return process;
}

Expand Down
2 changes: 0 additions & 2 deletions RawEventProcessor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -701,8 +701,6 @@ bool RawEventProcessor::process_syscall_event(const Event& event) {

std::string containerid;

Logger::Info("IB Processing syscall event: syscall=%s pid=%d ppid=%d uid=%d gid=%d exe=%s", _syscall.c_str(), _pid, _ppid, uid, gid, exe.c_str());

if (_processTree) {
if (!_syscall.empty() && starts_with(_syscall, "execve")) {
if (!exe.empty() && exe.front() == '"' && exe.back() == '"') {
Expand Down
2 changes: 1 addition & 1 deletion auoms.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ int main(int argc, char**argv) {
virt_limit = config.GetUint64("virt_limit");
}

bool use_syslog = false;
bool use_syslog = true;
if (config.HasKey("use_syslog")) {
use_syslog = config.GetBool("use_syslog");
}
Expand Down

0 comments on commit 436ceef

Please sign in to comment.