Merge pull request #6403 from 21pages/flexi_logger

update flexi_logger to 0.27.3
This commit is contained in:
RustDesk 2023-11-14 11:12:52 +08:00 committed by GitHub
commit d64afdcff1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions

4
Cargo.lock generated
View File

@ -2017,9 +2017,9 @@ dependencies = [
[[package]]
name = "flexi_logger"
version = "0.25.6"
version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84075a94fd76ea9b7a0d2c257444ae30356e58fdac6cd0fe68af33f5279981ae"
checksum = "2ac35b454b60e1836602173e2eb7ef531173388c0212e02ec7f9fac086159ee5"
dependencies = [
"chrono",
"crossbeam-channel",

View File

@ -7,7 +7,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
flexi_logger = { version = "0.25", features = ["async"] }
flexi_logger = { version = "0.27", features = ["async"] }
protobuf = { version = "3.2", features = ["with-bytes"] }
tokio = { version = "=1.28.1", features = ["full"] }
tokio-util = { version = "0.7", features = ["full"] }

View File

@ -342,6 +342,10 @@ pub fn init_log(_is_async: bool, _name: &str) -> Option<flexi_logger::LoggerHand
// though async logger more efficient, but it also causes more problems, disable it for now
let mut logger_holder: Option<flexi_logger::LoggerHandle> = None;
let mut path = config::Config::log_path();
#[cfg(target_os = "android")]
if !config::Config::get_home().exists() {
return None;
}
if !_name.is_empty() {
path.push(_name);
}