mirror of
https://github.com/spacedriveapp/spacedrive
synced 2024-07-06 23:43:32 +00:00
Logging to logcat instead of logfile
Hopefully works now?
This commit is contained in:
parent
f7b0e3bd06
commit
ded1bae8e0
18
Cargo.lock
generated
18
Cargo.lock
generated
|
@ -132,6 +132,12 @@ version = "0.1.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
|
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "android_log-sys"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "android_system_properties"
|
name = "android_system_properties"
|
||||||
version = "0.1.5"
|
version = "0.1.5"
|
||||||
|
@ -9024,6 +9030,7 @@ dependencies = [
|
||||||
"tokio-util",
|
"tokio-util",
|
||||||
"tower-service",
|
"tower-service",
|
||||||
"tracing",
|
"tracing",
|
||||||
|
"tracing-android",
|
||||||
"tracing-appender",
|
"tracing-appender",
|
||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
"tracing-test",
|
"tracing-test",
|
||||||
|
@ -11239,6 +11246,17 @@ dependencies = [
|
||||||
"tracing-core",
|
"tracing-core",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tracing-android"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "12612be8f868a09c0ceae7113ff26afe79d81a24473a393cb9120ece162e86c0"
|
||||||
|
dependencies = [
|
||||||
|
"android_log-sys",
|
||||||
|
"tracing",
|
||||||
|
"tracing-subscriber",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing-appender"
|
name = "tracing-appender"
|
||||||
version = "0.2.3"
|
version = "0.2.3"
|
||||||
|
|
|
@ -62,6 +62,7 @@ tokio = "1.38"
|
||||||
tokio-stream = "0.1.15"
|
tokio-stream = "0.1.15"
|
||||||
tokio-util = "0.7.11"
|
tokio-util = "0.7.11"
|
||||||
tracing = "0.1.40"
|
tracing = "0.1.40"
|
||||||
|
tracing-android = "0.2.0"
|
||||||
tracing-subscriber = "0.3.18"
|
tracing-subscriber = "0.3.18"
|
||||||
tracing-test = "0.2.5"
|
tracing-test = "0.2.5"
|
||||||
uhlc = "0.6.0" # Must follow version used by specta
|
uhlc = "0.6.0" # Must follow version used by specta
|
||||||
|
|
|
@ -102,6 +102,7 @@ tokio = { workspace = true, features = [
|
||||||
tokio-stream = { workspace = true, features = ["fs"] }
|
tokio-stream = { workspace = true, features = ["fs"] }
|
||||||
tokio-util = { workspace = true, features = ["io"] }
|
tokio-util = { workspace = true, features = ["io"] }
|
||||||
tracing = { workspace = true }
|
tracing = { workspace = true }
|
||||||
|
tracing-android = { workspace = true }
|
||||||
tracing-subscriber = { workspace = true, features = ["env-filter"] }
|
tracing-subscriber = { workspace = true, features = ["env-filter"] }
|
||||||
uuid = { workspace = true, features = ["v4", "serde"] }
|
uuid = { workspace = true, features = ["v4", "serde"] }
|
||||||
webp = { workspace = true }
|
webp = { workspace = true }
|
||||||
|
|
|
@ -31,7 +31,7 @@ use tracing_appender::{
|
||||||
non_blocking::{NonBlocking, WorkerGuard},
|
non_blocking::{NonBlocking, WorkerGuard},
|
||||||
rolling::{RollingFileAppender, Rotation},
|
rolling::{RollingFileAppender, Rotation},
|
||||||
};
|
};
|
||||||
use tracing_subscriber::{filter::FromEnvError, prelude::*, EnvFilter};
|
use tracing_subscriber::{filter::FromEnvError, prelude::*, registry, EnvFilter};
|
||||||
|
|
||||||
pub mod api;
|
pub mod api;
|
||||||
mod cloud;
|
mod cloud;
|
||||||
|
@ -235,11 +235,13 @@ impl Node {
|
||||||
|
|
||||||
// Set a default if the user hasn't set an override
|
// Set a default if the user hasn't set an override
|
||||||
if std::env::var("RUST_LOG") == Err(std::env::VarError::NotPresent) {
|
if std::env::var("RUST_LOG") == Err(std::env::VarError::NotPresent) {
|
||||||
let level = if cfg!(debug_assertions) {
|
// let level = if cfg!(debug_assertions) {
|
||||||
"debug"
|
// "debug"
|
||||||
} else {
|
// } else {
|
||||||
"info"
|
// "info"
|
||||||
};
|
// };
|
||||||
|
|
||||||
|
let level = "debug";
|
||||||
|
|
||||||
std::env::set_var(
|
std::env::set_var(
|
||||||
"RUST_LOG",
|
"RUST_LOG",
|
||||||
|
@ -254,13 +256,18 @@ impl Node {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
tracing_subscriber::registry()
|
let registry = registry();
|
||||||
|
|
||||||
|
#[cfg(target_os = "android")]
|
||||||
|
let registry = registry.with(tracing_android::layer("com.spacedrive.app").unwrap());
|
||||||
|
|
||||||
|
let registry = registry
|
||||||
.with(
|
.with(
|
||||||
tracing_subscriber::fmt::layer()
|
tracing_subscriber::fmt::layer()
|
||||||
.with_file(true)
|
.with_file(true)
|
||||||
.with_line_number(true)
|
.with_line_number(true)
|
||||||
.with_ansi(false)
|
.with_ansi(false)
|
||||||
.with_writer(logfile)
|
// .with_writer(logfile)
|
||||||
.with_filter(EnvFilter::from_default_env()),
|
.with_filter(EnvFilter::from_default_env()),
|
||||||
)
|
)
|
||||||
.with(
|
.with(
|
||||||
|
@ -269,8 +276,9 @@ impl Node {
|
||||||
.with_line_number(true)
|
.with_line_number(true)
|
||||||
.with_writer(std::io::stdout)
|
.with_writer(std::io::stdout)
|
||||||
.with_filter(EnvFilter::from_default_env()),
|
.with_filter(EnvFilter::from_default_env()),
|
||||||
)
|
);
|
||||||
.init();
|
|
||||||
|
registry.init();
|
||||||
|
|
||||||
std::panic::set_hook(Box::new(move |panic| {
|
std::panic::set_hook(Box::new(move |panic| {
|
||||||
use std::backtrace::{Backtrace, BacktraceStatus};
|
use std::backtrace::{Backtrace, BacktraceStatus};
|
||||||
|
|
Loading…
Reference in a new issue