Write OS & console logs separately
Use two files instead of one, otherwise one log overwrites the other.
Bug: 210170415
Test: compos_cmd forced-compile-test, check logs
Change-Id: I189740335bc25047cf7f99504c6ecdbcec5c429d
diff --git a/compos/common/compos_client.rs b/compos/common/compos_client.rs
index 6c16bb0..9c23fac 100644
--- a/compos/common/compos_client.rs
+++ b/compos/common/compos_client.rs
@@ -87,14 +87,17 @@
.context("Failed to open config APK idsig file")?;
let idsig_fd = ParcelFileDescriptor::new(idsig_fd);
- let (log_fd, debug_level) = if parameters.debug_mode {
- // Console output and the system log output from the VM are redirected to this file.
- let log_fd =
- File::create(data_dir.join("vm.log")).context("Failed to create log file")?;
+ let (console_fd, log_fd, debug_level) = if parameters.debug_mode {
+ // Console output and the system log output from the VM are redirected to file.
+ let console_fd = File::create(data_dir.join("vm_console.log"))
+ .context("Failed to create console log file")?;
+ let log_fd = File::create(data_dir.join("vm.log"))
+ .context("Failed to create system log file")?;
+ let console_fd = ParcelFileDescriptor::new(console_fd);
let log_fd = ParcelFileDescriptor::new(log_fd);
- (Some(log_fd), DebugLevel::FULL)
+ (Some(console_fd), Some(log_fd), DebugLevel::FULL)
} else {
- (None, DebugLevel::NONE)
+ (None, None, DebugLevel::NONE)
};
let config_path = parameters.config_path.as_deref().unwrap_or(DEFAULT_VM_CONFIG_PATH);
@@ -108,7 +111,7 @@
});
let vm = service
- .createVm(&config, log_fd.as_ref(), log_fd.as_ref())
+ .createVm(&config, console_fd.as_ref(), log_fd.as_ref())
.context("Failed to create VM")?;
let vm_state = Arc::new(VmStateMonitor::default());