diff --git a/Cargo.lock b/Cargo.lock index 40529ea..deaea8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1031,7 +1031,7 @@ dependencies = [ "thiserror", "tokio", "tracing", - "tracing-error 0.2.0", + "tracing-error", "tracing-futures", ] @@ -1268,9 +1268,9 @@ dependencies = [ [[package]] name = "matchers" -version = "0.0.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ "regex-automata", ] @@ -1923,7 +1923,7 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "relay" -version = "0.3.6" +version = "0.3.7" dependencies = [ "activitystreams", "activitystreams-ext", @@ -1960,11 +1960,11 @@ dependencies = [ "tracing", "tracing-actix-web", "tracing-awc", - "tracing-error 0.1.2", + "tracing-error", "tracing-futures", "tracing-log", "tracing-opentelemetry", - "tracing-subscriber 0.2.25", + "tracing-subscriber", "uuid", ] @@ -2705,16 +2705,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "tracing-error" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4d7c0b83d4a500748fa5879461652b361edf5c9d51ede2a2ac03875ca185e24" -dependencies = [ - "tracing", - "tracing-subscriber 0.2.25", -] - [[package]] name = "tracing-error" version = "0.2.0" @@ -2722,7 +2712,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" dependencies = [ "tracing", - "tracing-subscriber 0.3.2", + "tracing-subscriber", ] [[package]] @@ -2748,47 +2738,15 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599f388ecb26b28d9c1b2e4437ae019a7b336018b45ed911458cd9ebf91129f6" +checksum = "3ffbf13a0f8b054a4e59df3a173b818e9c6177c02789871f2073977fd0062076" dependencies = [ "opentelemetry", "tracing", "tracing-core", "tracing-log", - "tracing-subscriber 0.2.25", -] - -[[package]] -name = "tracing-serde" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" -dependencies = [ - "serde 1.0.130", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" -dependencies = [ - "ansi_term 0.12.1", - "chrono", - "lazy_static", - "matchers", - "regex", - "serde 1.0.130", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", - "tracing-serde", + "tracing-subscriber", ] [[package]] @@ -2797,9 +2755,16 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7507ec620f809cdf07cccb5bc57b13069a88031b795efd4079b1c71b66c1613d" dependencies = [ + "ansi_term 0.12.1", + "lazy_static", + "matchers", + "regex", "sharded-slab", + "smallvec", "thread_local", + "tracing", "tracing-core", + "tracing-log", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 00338b4..461db06 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "relay" description = "A simple activitypub relay" -version = "0.3.6" +version = "0.3.7" authors = ["asonix "] license-file = "LICENSE" readme = "README.md" @@ -42,12 +42,12 @@ sled = "0.34.6" structopt = "0.3.12" thiserror = "1.0" tracing = "0.1" -tracing-awc = { version = "0.1.0-beta.6", git = "https://git.asonix.dog/asonix/tracing-awc" } -tracing-error = "0.1" +tracing-awc = { version = "0.1.0-beta.7", git = "https://git.asonix.dog/asonix/tracing-awc" } +tracing-error = "0.2" tracing-futures = "0.2" tracing-log = "0.1" -tracing-opentelemetry = "0.15" -tracing-subscriber = { version = "0.2", features = ["ansi", "fmt"] } +tracing-opentelemetry = "0.16" +tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "fmt"] } uuid = { version = "0.8", features = ["v4", "serde"] } [dependencies.background-jobs] @@ -59,7 +59,7 @@ features = [ ] [dependencies.http-signature-normalization-actix] -version = "0.5.0-beta.9" +version = "0.5.0-beta.11" default-features = false features = ["client", "server", "sha-2"] diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 52125b7..8c62706 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: relay: - image: asonix/relay:v0.3.5 + image: asonix/relay:v0.3.7 ports: - "8079:8079" restart: always diff --git a/src/main.rs b/src/main.rs index 09bc72e..8b0e7b4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -96,6 +96,7 @@ async fn main() -> Result<(), anyhow::Error> { let media = MediaCache::new(db.clone()); let state = State::build(db.clone()).await?; let actors = ActorCache::new(db.clone()); + let (manager, job_server) = create_workers( db.clone(), state.clone(),