commit 63f460c2f3054f4ab74b14b771c2df3c2e3f5c40
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 23 00:03:12 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 23 00:03:12 2021 +0000
tree 06a2b0e5a129fee094a409467a2280a313ea9375
parent ba430692c16b108eaafd59b2dce25bbbe839a586
parent ed3334b43db22d69b30ceb4e1224d6cc1d195bd6

Merge "Log details if payload exits via signal" am: ed3334b43d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/1832322

Change-Id: I69c8ddbd1338595dd78c408ee04eb16b35d97794

microdroid_manager/src/main.rs

diff --git a/microdroid_manager/src/main.rs b/microdroid_manager/src/main.rs
index 9c1792d..319ca2b 100644
--- a/microdroid_manager/src/main.rs
+++ b/microdroid_manager/src/main.rs
@@ -246,7 +246,8 @@
     info!("notifying payload started");
     service.notifyPayloadStarted(local_cid as i32)?;
 
-    if let Some(code) = child.wait()?.code() {
+    let exit_status = child.wait()?;
+    if let Some(code) = exit_status.code() {
         info!("notifying payload finished");
         service.notifyPayloadFinished(local_cid as i32, code)?;
 
@@ -256,7 +257,7 @@
             error!("task exited with exit code: {}", code);
         }
     } else {
-        error!("task terminated by signal");
+        error!("task terminated: {}", exit_status);
     }
     Ok(())
 }