Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(nss): Improve NSS error logs #403

Merged
merged 1 commit into from
Jul 1, 2024
Merged

fix(nss): Improve NSS error logs #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions nss/src/group/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fn get_all_entries() -> Response<Vec<Group>> {
match client.get_group_entries(req).await {
Ok(r) => Response::Success(group_entries_to_groups(r.into_inner().entries)),
Err(e) => {
error!("error when listing groups: {}", e.message());
error!("error when listing groups: {}", e.code().description());
super::grpc_status_to_nss_response(e)
}
}
Expand Down Expand Up @@ -81,7 +81,11 @@ fn get_entry_by_gid(gid: gid_t) -> Response<Group> {
match client.get_group_by_gid(req).await {
Ok(r) => Response::Success(group_entry_to_group(r.into_inner())),
Err(e) => {
error!("error when getting group by gid: {}", e.message());
error!(
"error when getting group by gid '{}': {}",
gid,
e.code().description()
);
super::grpc_status_to_nss_response(e)
}
}
Expand All @@ -107,12 +111,16 @@ fn get_entry_by_name(name: String) -> Response<Group> {
}
};

let mut req = Request::new(authd::GetGroupByNameRequest { name });
let mut req = Request::new(authd::GetGroupByNameRequest { name: name.clone() });
req.set_timeout(REQUEST_TIMEOUT);
match client.get_group_by_name(req).await {
Ok(r) => Response::Success(group_entry_to_group(r.into_inner())),
Err(e) => {
error!("error when getting group by name: {}", e.message());
error!(
"error when getting group by name '{}': {}",
name,
e.code().description()
);
super::grpc_status_to_nss_response(e)
}
}
Expand Down
16 changes: 12 additions & 4 deletions nss/src/passwd/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fn get_all_entries() -> Response<Vec<Passwd>> {
match client.get_passwd_entries(req).await {
Ok(r) => Response::Success(passwd_entries_to_passwds(r.into_inner().entries)),
Err(e) => {
error!("error when listing passwd: {}", e.message());
error!("error when listing passwd: {}", e.code().description());
super::grpc_status_to_nss_response(e)
}
}
Expand Down Expand Up @@ -81,7 +81,11 @@ fn get_entry_by_uid(uid: uid_t) -> Response<Passwd> {
match client.get_passwd_by_uid(req).await {
Ok(r) => Response::Success(passwd_entry_to_passwd(r.into_inner())),
Err(e) => {
error!("error when getting passwd by uid: {}", e.message());
error!(
"error when getting passwd by uid '{}': {}",
uid,
e.code().description()
);
super::grpc_status_to_nss_response(e)
}
}
Expand All @@ -108,14 +112,18 @@ fn get_entry_by_name(name: String) -> Response<Passwd> {
};

let mut req = Request::new(authd::GetPasswdByNameRequest {
name,
name: name.clone(),
should_pre_check: should_pre_check(),
});
req.set_timeout(REQUEST_TIMEOUT);
match client.get_passwd_by_name(req).await {
Ok(r) => Response::Success(passwd_entry_to_passwd(r.into_inner())),
Err(e) => {
error!("error when getting passwd by name: {}", e.message());
error!(
"error when getting passwd by name '{}': {}",
name,
e.code().description()
);
super::grpc_status_to_nss_response(e)
}
}
Expand Down
10 changes: 7 additions & 3 deletions nss/src/shadow/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fn get_all_entries() -> Response<Vec<Shadow>> {
match client.get_shadow_entries(req).await {
Ok(r) => Response::Success(shadow_entries_to_shadows(r.into_inner().entries)),
Err(e) => {
error!("error when listing shadow: {}", e.message());
error!("error when listing shadow: {}", e.code().description());
super::grpc_status_to_nss_response(e)
}
}
Expand All @@ -71,12 +71,16 @@ fn get_entry_by_name(name: String) -> Response<Shadow> {
}
};

let mut req = Request::new(authd::GetShadowByNameRequest { name });
let mut req = Request::new(authd::GetShadowByNameRequest { name: name.clone() });
req.set_timeout(REQUEST_TIMEOUT);
match client.get_shadow_by_name(req).await {
Ok(r) => Response::Success(shadow_entry_to_shadow(r.into_inner())),
Err(e) => {
error!("error when getting shadow by name: {}", e.message());
error!(
"error when getting shadow by name '{}': {}",
name,
e.code().description()
);
super::grpc_status_to_nss_response(e)
}
}
Expand Down
Loading