From 6480d875b58de23804067972c681599197040c4c Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Fri, 8 Mar 2024 18:54:35 +0000 Subject: [PATCH] Make snapshotctl also log to logd. Since http://r.android.com/2994274, snapshotctl can be run by init. Therefore, we need it to log to logd for better debuggability. Bug: 311377497 Test: adb shell setprop sys.snapshotctl.map requested Test: adb shell setprop sys.snapshotctl.unmap requested Change-Id: I287ecf77d45fb9e6c44bea36e14d2624029afea5 --- fs_mgr/libsnapshot/snapshotctl.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fs_mgr/libsnapshot/snapshotctl.cpp b/fs_mgr/libsnapshot/snapshotctl.cpp index 50e9f4823..5d3f96cf9 100644 --- a/fs_mgr/libsnapshot/snapshotctl.cpp +++ b/fs_mgr/libsnapshot/snapshotctl.cpp @@ -52,6 +52,9 @@ using namespace std::chrono_literals; using namespace std::string_literals; using namespace android::storage_literals; +using android::base::LogdLogger; +using android::base::StderrLogger; +using android::base::TeeLogger; using android::fs_mgr::CreateLogicalPartitionParams; using android::fs_mgr::FindPartition; using android::fs_mgr::GetPartitionSize; @@ -461,23 +464,23 @@ bool MapSnapshots::DeleteSnapshots() { } bool DumpCmdHandler(int /*argc*/, char** argv) { - android::base::InitLogging(argv, &android::base::StderrLogger); + android::base::InitLogging(argv, TeeLogger(LogdLogger(), &StderrLogger)); return SnapshotManager::New()->Dump(std::cout); } bool MapCmdHandler(int, char** argv) { - android::base::InitLogging(argv, &android::base::StderrLogger); + android::base::InitLogging(argv, TeeLogger(LogdLogger(), &StderrLogger)); using namespace std::chrono_literals; return SnapshotManager::New()->MapAllSnapshots(5000ms); } bool UnmapCmdHandler(int, char** argv) { - android::base::InitLogging(argv, &android::base::StderrLogger); + android::base::InitLogging(argv, TeeLogger(LogdLogger(), &StderrLogger)); return SnapshotManager::New()->UnmapAllSnapshots(); } bool MergeCmdHandler(int /*argc*/, char** argv) { - android::base::InitLogging(argv, &android::base::StderrLogger); + android::base::InitLogging(argv, TeeLogger(LogdLogger(), &StderrLogger)); LOG(WARNING) << "Deprecated. Call update_engine_client --merge instead."; return false; }