Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c4e8492 authored by Yun-hao Chung's avatar Yun-hao Chung Committed by Automerger Merge Worker
Browse files

Merge "Floss: Add log panics in btmanagerd" into main am: b713c243 

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



Change-Id: Iaa586b90626ee146bd683d503dc9353a8bf2b049
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a66abd4d b713c243

system/gd/rust/linux/mgmt/Cargo.toml

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ serde_json = "1.0" 
syslog = "6"

tokio = { version = "1.0", features = ["fs", "macros", "rt-multi-thread", "sync"] }

libc = "0.2"

log-panics = "2.1.0"



[build-dependencies]

pkg-config = "0.3.19"

system/gd/rust/linux/mgmt/src/main.rs

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ use dbus_crossroads::Crossroads; 
use dbus_projection::DisconnectWatcher;

use dbus_tokio::connection;

use log::LevelFilter;

use log_panics;

use manager_service::bluetooth_manager::BluetoothManager;

use manager_service::powerd_suspend_manager::PowerdSuspendManager;

use manager_service::{bluetooth_experimental_dbus, iface_bluetooth_manager};
@@ -50,6 +51,8 @@ pub async fn main() -> Result<(), Box<dyn std::error::Error>> { 
            pid: 0,

        };



        log_panics::init();



        let logger = syslog::unix(formatter).expect("could not connect to syslog");

        let _ = log::set_boxed_logger(Box::new(BasicLogger::new(logger)))

            .map(|()| log::set_max_level(config_util::get_log_level().unwrap_or(level_filter)));