DGNum/colmena
12
0
Fork 1
Code Issues 6 Pull requests 2 Projects Releases Packages Wiki Activity

Fix describe_node_list remaining nodes special case

Browse source 
Colmena truncates left over node names when it reaches a certain char limit.
This in it self is a sensible behaivior, but it should only do so if there is more then one node name remaining.
This commit is contained in:
Peter Lehmann 2024-09-02 22:32:59 +02:00
parent cd65ef7a25
commit 569c914f95
No known key found for this signature in database
GPG key ID: C141E17790DC45F7
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/job.rs
View file

@ -874,11 +874,17 @@ fn describe_node_list(nodes: &[NodeName]) -> Option<String> {
} }
let (idx, next) = next.unwrap(); let (idx, next) = next.unwrap();
let remaining = rough_limit - s.len(); let remaining_text = rough_limit - s.len();
let remaining_nodes = total - idx;
if next.len() + other_text.len() >= remaining { if next.len() + other_text.len() >= remaining_text {
write!(s, ", and {} other nodes", total - idx).unwrap(); if remaining_nodes == 1 {
break; write!(s, ", and {}", next.as_str()).unwrap();
break;
} else {
write!(s, ", and {} other nodes", remaining_nodes).unwrap();
break;
}
} }
} }