Skip to content

Commit

Permalink
Fix linting
Browse files Browse the repository at this point in the history
Signed-off-by: Dom Del Nano <[email protected]>
  • Loading branch information
ddelnano committed Dec 2, 2024
1 parent 4aca78b commit 9b29c58
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
3 changes: 2 additions & 1 deletion src/stirling/utils/linux_headers.cc
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ Status LinkHostLinuxHeadersKernel(const std::filesystem::path& lib_modules_dir)
const auto host_path = system::Config::GetInstance().ToHostPath(lib_modules_dir);
LOG(INFO) << absl::Substitute("Looking for host Linux headers at $0.", host_path.string());

PX_ASSIGN_OR_RETURN(const auto resolved_host_path, system::ResolvePossibleSymlinkToHostPath(host_path));
PX_ASSIGN_OR_RETURN(const auto resolved_host_path,
system::ResolvePossibleSymlinkToHostPath(host_path));
PX_RETURN_IF_ERROR(fs::CreateSymlinkIfNotExists(resolved_host_path, lib_modules_dir));
LOG(INFO) << absl::Substitute("Linked host headers at $0 to symlink in pem namespace at $1.",
resolved_host_path.string(), lib_modules_dir.string());
Expand Down
8 changes: 4 additions & 4 deletions src/vizier/services/agent/kelvin/kelvin_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ int main(int argc, char** argv) {
LOG(INFO) << absl::Substitute("Pixie Kelvin. Version: $0, id: $1, kernel: $2",
px::VersionInfo::VersionString(), agent_id.str(),
kernel_version.ToString());
auto manager =
KelvinManager::Create(agent_id, FLAGS_pod_name, FLAGS_host_ip, addr, FLAGS_rpc_port,
FLAGS_nats_url, mds_addr, kernel_version, /* kernel_headers_installed */ false)
auto manager = KelvinManager::Create(agent_id, FLAGS_pod_name, FLAGS_host_ip, addr,
FLAGS_rpc_port, FLAGS_nats_url, mds_addr, kernel_version,
/* kernel_headers_installed */ false)

TerminationHandler::set_manager(manager.get());
TerminationHandler::set_manager(manager.get());

PX_CHECK_OK(manager->Run());
PX_CHECK_OK(manager->Stop(std::chrono::seconds{1}));
Expand Down
3 changes: 2 additions & 1 deletion src/vizier/services/agent/pem/pem_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ int main(int argc, char** argv) {
auto kernel_headers_installed = false;
auto uname = px::system::GetUname();
if (uname.ok()) {
const auto host_path = px::system::Config::GetInstance().ToHostPath(absl::Substitute("$0/$1/$2", kLinuxHeadersPath, uname.ConsumeValueOrDie(), "build"));
const auto host_path = px::system::Config::GetInstance().ToHostPath(
absl::Substitute("$0/$1/$2", kLinuxHeadersPath, uname.ConsumeValueOrDie(), "build"));

const auto resolved_host_path = px::system::ResolvePossibleSymlinkToHostPath(host_path);
kernel_headers_installed = resolved_host_path.ok();
Expand Down

0 comments on commit 9b29c58

Please sign in to comment.