Skip to content

Commit d2e301d

Browse files
committed
Merge #1295: Refactor packages: extract axum-server and server-lib packages
0685f1a refactor: [#1294] extract server-lib package (Jose Celano) 3daf3f1 refactor: [#1294] extract axum-server package (Jose Celano) Pull request description: Refactor packages: extract `axum-server` and `server-lib` packages ACKs for top commit: josecelano: ACK 0685f1a Tree-SHA512: 686d814ee0beacd9804b0334fe1f7066b9fe22f58676981925f1dcbd80107036904d353095d95c08723d3bcef7f0ba9a0b3cb394f279bc953a519ca37499c862
2 parents df762d9 + 0685f1a commit d2e301d

38 files changed

+1496
-69
lines changed

.github/workflows/deployment.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ jobs:
6161
cargo publish -p bittorrent-tracker-core
6262
cargo publish -p bittorrent-udp-tracker-core
6363
cargo publish -p bittorrent-udp-tracker-protocol
64+
cargo publish -p torrust-axum-server
65+
cargo publish -p torrust-torrust-server-lib
6466
cargo publish -p torrust-tracker
6567
cargo publish -p torrust-tracker-api-client
6668
cargo publish -p torrust-tracker-api-core

Cargo.lock

+29-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+3-4
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ axum = { version = "0", features = ["macros"] }
3939
axum-client-ip = "0"
4040
axum-extra = { version = "0", features = ["query"] }
4141
axum-server = { version = "0", features = ["tls-rustls-no-provider"] }
42-
bittorrent-http-tracker-protocol = { version = "3.0.0-develop", path = "packages/http-protocol" }
4342
bittorrent-http-tracker-core = { version = "3.0.0-develop", path = "packages/http-tracker-core" }
43+
bittorrent-http-tracker-protocol = { version = "3.0.0-develop", path = "packages/http-protocol" }
4444
bittorrent-primitives = "0.1.0"
4545
bittorrent-tracker-client = { version = "3.0.0-develop", path = "packages/tracker-client" }
4646
bittorrent-tracker-core = { version = "3.0.0-develop", path = "packages/tracker-core" }
@@ -54,13 +54,10 @@ derive_more = { version = "1", features = ["as_ref", "constructor", "from"] }
5454
figment = "0"
5555
futures = "0"
5656
futures-util = "0"
57-
http-body = "1"
5857
hyper = "1"
59-
hyper-util = { version = "0", features = ["http1", "http2", "tokio"] }
6058
lazy_static = "1"
6159
parking_lot = "0"
6260
percent-encoding = "2"
63-
pin-project-lite = "0"
6461
r2d2 = "0"
6562
r2d2_mysql = "25"
6663
r2d2_sqlite = { version = "0", features = ["bundled"] }
@@ -76,6 +73,8 @@ serde_repr = "0"
7673
serde_with = { version = "3", features = ["json"] }
7774
thiserror = "2"
7875
tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
76+
torrust-axum-server = { version = "3.0.0-develop", path = "packages/axum-server" }
77+
torrust-server-lib = { version = "3.0.0-develop", path = "packages/server-lib" }
7978
torrust-tracker-api-core = { version = "3.0.0-develop", path = "packages/tracker-api-core" }
8079
torrust-tracker-clock = { version = "3.0.0-develop", path = "packages/clock" }
8180
torrust-tracker-configuration = { version = "3.0.0-develop", path = "packages/configuration" }

packages/axum-server/Cargo.toml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
[package]
2+
authors.workspace = true
3+
description = "A wrapper for the Axum server for Torrust HTTP servers to add timeouts."
4+
documentation.workspace = true
5+
edition.workspace = true
6+
homepage.workspace = true
7+
keywords = ["axum", "server", "torrust", "wrapper"]
8+
license.workspace = true
9+
name = "torrust-axum-server"
10+
publish.workspace = true
11+
readme = "README.md"
12+
repository.workspace = true
13+
rust-version.workspace = true
14+
version.workspace = true
15+
16+
[dependencies]
17+
axum-server = { version = "0", features = ["tls-rustls-no-provider"] }
18+
futures-util = "0"
19+
http-body = "1"
20+
hyper = "1"
21+
hyper-util = { version = "0", features = ["http1", "http2", "tokio"] }
22+
pin-project-lite = "0"
23+
tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
24+
torrust-server-lib = { version = "3.0.0-develop", path = "../server-lib" }
25+
tower = { version = "0", features = ["timeout"] }
26+
tracing = "0"
27+
28+
[dev-dependencies]

0 commit comments

Comments
 (0)