diff options
| author | Didier Wenzek <didier.wenzek@acidalie.com> | 2022-07-27 10:53:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 10:53:29 +0200 |
| commit | 8ab77c27571eb6680be4b43ff7670a6a08830ce0 (patch) | |
| tree | 758e7a184484c329322b1b84b37db910726a591d | |
| parent | 45b220f537d6a6c92772822927a432621e28438f (diff) | |
| parent | 5d84f2577dc27e721d3115555d588f7156dc792d (diff) | |
Merge pull request #1301 from matthiasbeyer/update-rumqttd
Update rumqttd
| -rw-r--r-- | Cargo.lock | 41 | ||||
| -rw-r--r-- | crates/tests/mqtt_tests/Cargo.toml | 3 | ||||
| -rw-r--r-- | crates/tests/mqtt_tests/src/test_mqtt_server.rs | 2 |
3 files changed, 18 insertions, 28 deletions
@@ -1656,7 +1656,6 @@ dependencies = [ "once_cell", "rumqttc", "rumqttd", - "rumqttlog", "tokio", ] @@ -2311,7 +2310,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.20.6", - "rustls-pemfile", + "rustls-pemfile 1.0.0", "serde", "serde_json", "serde_urlencoded", @@ -2381,45 +2380,28 @@ dependencies = [ [[package]] name = "rumqttd" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1b0c1bb4e345c681c0a13174ce78df48885b0855c06f6eadbad53efb8b5e3b" +checksum = "916b8c94b0703befa41eb45cb0b684e7050755be1a70ebd38cfe77faa879a829" dependencies = [ "argh", "bytes", "confy", "futures-util", + "jackiechan", "jemallocator", "log", - "mqttbytes", "pretty_env_logger", - "rumqttlog", + "rustls-pemfile 0.3.0", + "segments", "serde", "thiserror", "tokio", - "tokio-rustls 0.22.0", + "tokio-rustls 0.23.4", "warp", ] [[package]] -name = "rumqttlog" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031d0d6fc69b8f36267870724b7a28e4a9396d0b3f722f84b5631c56c0840244" -dependencies = [ - "byteorder", - "bytes", - "fnv", - "jackiechan", - "log", - "memmap", - "mqttbytes", - "segments", - "serde", - "thiserror", -] - -[[package]] name = "rustc-demangle" version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2461,6 +2443,15 @@ dependencies = [ [[package]] name = "rustls-pemfile" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-pemfile" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" diff --git a/crates/tests/mqtt_tests/Cargo.toml b/crates/tests/mqtt_tests/Cargo.toml index 875f276a..ff0e505d 100644 --- a/crates/tests/mqtt_tests/Cargo.toml +++ b/crates/tests/mqtt_tests/Cargo.toml @@ -13,6 +13,5 @@ fastrand = "1.8" futures = "0.3" once_cell = "1.8" rumqttc = "0.10" -rumqttd = "0.9" -rumqttlog = "0.9" +rumqttd = "0.11" tokio = { version = "1.9", default_features = false, features = [] } diff --git a/crates/tests/mqtt_tests/src/test_mqtt_server.rs b/crates/tests/mqtt_tests/src/test_mqtt_server.rs index e469f8d2..675e715a 100644 --- a/crates/tests/mqtt_tests/src/test_mqtt_server.rs +++ b/crates/tests/mqtt_tests/src/test_mqtt_server.rs @@ -111,7 +111,7 @@ fn spawn_broker(port: u16) { } fn get_rumqttd_config(port: u16) -> Config { - let router_config = rumqttlog::Config { + let router_config = librumqttd::rumqttlog::Config { id: 0, dir: "/tmp/rumqttd".into(), max_segment_size: 10240, |