travisshears / nostr-rs-relay json logging

bf6abd3 (HEAD -> master, homelab/master) feat: json logging diff --git a/Cargo.lock b/Cargo.lock index c8354d2..3ca8556 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3671,6 +3671,16 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-serde" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" +dependencies = [ + "serde", + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.3.19" @@ -3681,12 +3691,15 @@ dependencies = [ "nu-ansi-term", "once_cell", "regex", + "serde", + "serde_json", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", "tracing-log", + "tracing-serde", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 7f0ce2e..4a72c91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ categories = ["network-programming", "web-programming"] clap = { version = "4.0.32", features = ["env", "default", "derive"]} tracing = "0.1.37" tracing-appender = "0.2.2" -tracing-subscriber = "0.3.16" +tracing-subscriber = { version = "0.3.16", features = ["fmt", "json"] } tokio = { version = "1", features = ["full", "tracing", "signal"] } prost = "0.11" tonic = "0.8.3" diff --git a/Dockerfile b/Dockerfile index 0b0083e..27a36eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ WORKDIR ./nostr-rs-relay COPY ./Cargo.toml ./Cargo.toml COPY ./Cargo.lock ./Cargo.lock # build dependencies only (caching) -RUN cargo auditable build --release --locked +RUN cargo auditable build --release # get rid of starter project code RUN rm src/*.rs @@ -19,7 +19,7 @@ COPY ./build.rs ./build.rs # build auditable release using locked deps RUN rm ./target/release/deps/nostr*relay* -RUN cargo auditable build --release --locked +RUN cargo auditable build --release FROM docker.io/library/debian:bookworm-slim @@ -48,5 +48,6 @@ WORKDIR ${APP} ENV RUST_LOG=info,nostr_rs_relay=info ENV APP_DATA=${APP_DATA} +COPY ./my_config.toml /usr/src/app/config.toml CMD ./nostr-rs-relay --db ${APP_DATA} diff --git a/README.md b/README.md index d56b665..92bc3d4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ +# nostr-rs-relay Fork with JSON logging + +Made this because I wanted logs in Loki + + # [nostr-rs-relay](https://git.sr.ht/~gheartsfield/nostr-rs-relay) This is a [nostr](https://github.com/nostr-protocol/nostr) relay, diff --git a/src/main.rs b/src/main.rs index feadf2c..f59427d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -81,8 +81,10 @@ fn main() { .try_init() .unwrap(); } else { - // write to stdout - tracing_subscriber::fmt::try_init().unwrap(); + tracing_subscriber::fmt() + .json() + .flatten_event(true) // optional: flattens fields into top-level JSON + .init() } } info!("Starting up from main");