improvement: Accept CancellationToken, catch exceptions when running ds websocket server
This commit is contained in:
1 parent
a2344e1494
commit
9c184d7203
2 files changed
+62
-27
No files matched your search
+9
-9
@@ -1,7 +1,5 @@
|
||||
namespace Bts.DataStreamWebApp.Server.Controllers;
|
||||
|
||||
using bts.api.core;
|
||||
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
[Route("/ws")]
|
||||
@@ -14,17 +12,19 @@ public class DataStreamSubscriptionController : ControllerBase {
|
||||
}
|
||||
|
||||
[Route("/ws")]
|
||||
public async Task Get() {
|
||||
public async Task Get(CancellationToken cancellationToken) {
|
||||
if (!HttpContext.WebSockets.IsWebSocketRequest) {
|
||||
logger.LogError("Expected websocket request on path '{}'", HttpContext.Request.Path);
|
||||
return;
|
||||
}
|
||||
logger.LogInformation("Establishing websocket connection...");
|
||||
using var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
|
||||
logger.LogInformation("Websocket connection established.");
|
||||
var context = ServiceContext.create();
|
||||
await context.login("bts", string.Empty);
|
||||
var server = new DataStreamWebSocketServer(webSocket, logger);
|
||||
await server.Run();
|
||||
try {
|
||||
using var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
|
||||
logger.LogInformation("Websocket connection established.");
|
||||
using var server = new DataStreamWebSocketServer(webSocket, logger);
|
||||
await server.Run(cancellationToken);
|
||||
} catch (Exception ex) {
|
||||
logger.LogError("DataStreamSubscriptionController.Run threw exception: {Exception}", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user