Page Menu
Home
Phorge
Search
Configure Global Search
Log In
Files
F33307612
D9317.1768798739.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Size
1 KB
Referenced Files
None
Subscribers
None
D9317.1768798739.diff
View Options
diff --git a/services/tunnelbroker/src/websockets/session.rs b/services/tunnelbroker/src/websockets/session.rs
--- a/services/tunnelbroker/src/websockets/session.rs
+++ b/services/tunnelbroker/src/websockets/session.rs
@@ -7,7 +7,8 @@
use hyper_tungstenite::{tungstenite::Message, WebSocketStream};
use lapin::message::Delivery;
use lapin::options::{
- BasicConsumeOptions, BasicPublishOptions, QueueDeclareOptions,
+ BasicCancelOptions, BasicConsumeOptions, BasicPublishOptions,
+ QueueDeclareOptions, QueueDeleteOptions,
};
use lapin::types::FieldTable;
use lapin::BasicProperties;
@@ -242,10 +243,32 @@
}
}
- // Release websocket and remove from active connections
+ // Release WebSocket and remove from active connections
pub async fn close(&mut self) {
if let Err(e) = self.tx.close().await {
- debug!("Failed to close session: {}", e);
+ debug!("Failed to close WebSocket session: {}", e);
+ }
+
+ if let Err(e) = self
+ .amqp_channel
+ .basic_cancel(
+ self.amqp_consumer.tag().as_str(),
+ BasicCancelOptions::default(),
+ )
+ .await
+ {
+ error!("Failed to cancel consumer: {}", e);
+ }
+
+ if let Err(e) = self
+ .amqp_channel
+ .queue_delete(
+ self.device_info.device_id.as_str(),
+ QueueDeleteOptions::default(),
+ )
+ .await
+ {
+ error!("Failed to delete queue: {}", e);
}
}
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Jan 19, 4:58 AM (6 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5954470
Default Alt Text
D9317.1768798739.diff (1 KB)
Attached To
Mode
D9317: [Tunnelbroker] close RabbitMQ queue when client disconnects
Attached
Detach File
Event Timeline
Log In to Comment