Page Menu
Home
Phorge
Search
Configure Global Search
Log In
Files
F33341839
D13612.1768924500.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Size
727 B
Referenced Files
None
Subscribers
None
D13612.1768924500.diff
View Options
diff --git a/services/tunnelbroker/src/main.rs b/services/tunnelbroker/src/main.rs
--- a/services/tunnelbroker/src/main.rs
+++ b/services/tunnelbroker/src/main.rs
@@ -158,11 +158,11 @@
);
tokio::select! {
- Ok(_) = grpc_server => { Ok(()) },
- Ok(_) = websocket_server => { Ok(()) },
- else => {
- tracing::error!(errorType = error_types::SERVER_ERROR, "A grpc or websocket server crashed.");
- Err(anyhow!("A grpc or websocket server crashed."))
- }
+ grpc_result = grpc_server => {
+ grpc_result.map_err(|err| anyhow!("gRPC server failed: {:?}", err))
+ },
+ ws_result = websocket_server => {
+ ws_result.map_err(|err| anyhow!("WS server failed: {:?}", err))
+ },
}
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Jan 20, 3:55 PM (19 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5961433
Default Alt Text
D13612.1768924500.diff (727 B)
Attached To
Mode
D13612: [tunnelbroker] Fix error handling in main
Attached
Detach File
Event Timeline
Log In to Comment