Merge branch 'master' into parse_ihdr_header

This commit is contained in:
Josh Holmer 2021-02-24 13:53:03 -05:00 committed by GitHub
commit 35edda7fef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -785,12 +785,14 @@ impl Deadline {
if let Some(imp) = &self.imp { if let Some(imp) = &self.imp {
let elapsed = imp.start.elapsed(); let elapsed = imp.start.elapsed();
if elapsed > imp.timeout { if elapsed > imp.timeout {
if imp.print_message.compare_exchange( if match imp.print_message.compare_exchange(
true, true,
false, false,
Ordering::SeqCst, Ordering::SeqCst,
Ordering::SeqCst, Ordering::SeqCst,
) { ) {
Ok(x) | Err(x) => x,
} {
warn!("Timed out after {} second(s)", elapsed.as_secs()); warn!("Timed out after {} second(s)", elapsed.as_secs());
} }
return true; return true;