[pbs-devel] [PATCH proxmox v2 3/4] rest-server: optionally depend on factored out shared rate limiter

[Christian Ebner <c.ebner@proxmox.com>]

The rate limiter implementation has been moved to a dedicated crate,
so depend on it for the rest servers rate limited stream connection.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
Changes since version 1:
- not present in previous version

 proxmox-rest-server/Cargo.toml        |  2 ++
 proxmox-rest-server/debian/control    | 14 ++++++++------
 proxmox-rest-server/src/connection.rs |  4 +++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/proxmox-rest-server/Cargo.toml b/proxmox-rest-server/Cargo.toml
index 81d93ca1..7478f6a8 100644
--- a/proxmox-rest-server/Cargo.toml
+++ b/proxmox-rest-server/Cargo.toml
@@ -44,6 +44,7 @@ proxmox-daemon.workspace = true
 proxmox-http = { workspace = true, features = ["body"] }
 proxmox-lang.workspace = true
 proxmox-log.workspace = true
+proxmox-rate-limiter = { workspace = true, optional = true, features = [ "shared-rate-limiter" ] }
 proxmox-router.workspace = true
 proxmox-schema = { workspace = true, features = [ "api-macro", "upid-api-impl" ] }
 proxmox-sys = { workspace = true, features = [ "logrotate", "timer" ] }
@@ -54,5 +55,6 @@ proxmox-worker-task.workspace = true
 default = []
 templates = ["dep:handlebars"]
 rate-limited-stream = [
+    "dep:proxmox-rate-limiter",
     "proxmox-http/rate-limited-stream",
 ]
diff --git a/proxmox-rest-server/debian/control b/proxmox-rest-server/debian/control
index 263ca7ea..ee04bd3f 100644
--- a/proxmox-rest-server/debian/control
+++ b/proxmox-rest-server/debian/control
@@ -29,8 +29,8 @@ Build-Depends-Arch: cargo:native <!nocheck>,
  librust-proxmox-async-0.5+default-dev <!nocheck>,
  librust-proxmox-compression-1+default-dev <!nocheck>,
  librust-proxmox-daemon-1+default-dev <!nocheck>,
- librust-proxmox-http-1+body-dev (>= 1.0.2-~~) <!nocheck>,
- librust-proxmox-http-1+default-dev (>= 1.0.2-~~) <!nocheck>,
+ librust-proxmox-http-1+body-dev (>= 1.0.3-~~) <!nocheck>,
+ librust-proxmox-http-1+default-dev (>= 1.0.3-~~) <!nocheck>,
  librust-proxmox-lang-1+default-dev (>= 1.5-~~) <!nocheck>,
  librust-proxmox-log-1+default-dev <!nocheck>,
  librust-proxmox-router-3+default-dev (>= 3.2.2-~~) <!nocheck>,
@@ -91,8 +91,8 @@ Depends:
  librust-proxmox-async-0.5+default-dev,
  librust-proxmox-compression-1+default-dev,
  librust-proxmox-daemon-1+default-dev,
- librust-proxmox-http-1+body-dev (>= 1.0.2-~~),
- librust-proxmox-http-1+default-dev (>= 1.0.2-~~),
+ librust-proxmox-http-1+body-dev (>= 1.0.3-~~),
+ librust-proxmox-http-1+default-dev (>= 1.0.3-~~),
  librust-proxmox-lang-1+default-dev (>= 1.5-~~),
  librust-proxmox-log-1+default-dev,
  librust-proxmox-router-3+default-dev (>= 3.2.2-~~),
@@ -137,8 +137,10 @@ Multi-Arch: same
 Depends:
  ${misc:Depends},
  librust-proxmox-rest-server-dev (= ${binary:Version}),
- librust-proxmox-http-1+body-dev (>= 1.0.2-~~),
- librust-proxmox-http-1+rate-limited-stream-dev (>= 1.0.2-~~)
+ librust-proxmox-http-1+body-dev (>= 1.0.3-~~),
+ librust-proxmox-http-1+rate-limited-stream-dev (>= 1.0.3-~~),
+ librust-proxmox-rate-limiter-1+default-dev,
+ librust-proxmox-rate-limiter-1+shared-rate-limiter-dev
 Provides:
  librust-proxmox-rest-server-1+rate-limited-stream-dev (= ${binary:Version}),
  librust-proxmox-rest-server-1.0+rate-limited-stream-dev (= ${binary:Version}),
diff --git a/proxmox-rest-server/src/connection.rs b/proxmox-rest-server/src/connection.rs
index 9511b7cb..6ffaac73 100644
--- a/proxmox-rest-server/src/connection.rs
+++ b/proxmox-rest-server/src/connection.rs
@@ -24,7 +24,9 @@ use tokio_openssl::SslStream;
 use tokio_stream::wrappers::ReceiverStream;
 
 #[cfg(feature = "rate-limited-stream")]
-use proxmox_http::{RateLimitedStream, ShareableRateLimit};
+use proxmox_http::RateLimitedStream;
+#[cfg(feature = "rate-limited-stream")]
+use proxmox_rate_limiter::ShareableRateLimit;
 
 #[cfg(feature = "rate-limited-stream")]
 pub type SharedRateLimit = Arc<dyn ShareableRateLimit>;
-- 
2.47.3



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel