Skip to content

Commit

Permalink
Use a static for the string "incomplete"
Browse files Browse the repository at this point in the history
  • Loading branch information
mstemm committed Mar 28, 2019
1 parent 728ec00 commit b74ceaf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 2 additions & 0 deletions userspace/libsinsp/container_engine/docker.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ class docker
void parse_docker_async(sinsp *inspector, std::string &container_id, sinsp_container_manager *manager);

static std::unique_ptr<docker_async_source> g_docker_info_source;

static std::string s_incomplete_info_name;
};
}
}
6 changes: 4 additions & 2 deletions userspace/libsinsp/container_engine/docker_common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ void docker_async_source::set_query_image_info(bool query_image_info)
m_query_image_info = query_image_info;
}

std::string docker::s_incomplete_info_name = "incomplete";

bool docker::resolve(sinsp_container_manager* manager, sinsp_threadinfo* tinfo, bool query_os_for_missing_info)
{
std::string container_id, container_name;
Expand All @@ -191,14 +193,14 @@ bool docker::resolve(sinsp_container_manager* manager, sinsp_threadinfo* tinfo,
{
// Add a minimal container_info object where only the
// container id, (possibly) name, and a container
// image=incomplete is filled in. This may be
// image = incomplete is filled in. This may be
// overidden later once parse_docker_async completes.
sinsp_container_info container_info;

container_info.m_type = CT_DOCKER;
container_info.m_id = container_id;
container_info.m_name = container_name;
container_info.m_image="incomplete";
container_info.m_image = s_incomplete_info_name;
container_info.m_metadata_complete = false;

manager->add_container(container_info, tinfo);
Expand Down
2 changes: 1 addition & 1 deletion userspace/libsinsp/container_engine/docker_linux.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ bool docker::detect_docker(const sinsp_threadinfo *tinfo, std::string &container
if(matches_runc_cgroups(tinfo, DOCKER_CGROUP_LAYOUT, container_id))
{
// The container name is only available in windows
container_name = "incomplete";
container_name = s_incomplete_info_name;

return true;
}
Expand Down

0 comments on commit b74ceaf

Please sign in to comment.