Skip to content

Commit 9020fb6

Browse files
committed
Make a note of session ID
1 parent f6bd8cb commit 9020fb6

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

source/TS.NET.Engine/Waveform Buffer Readers/DataServer.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private void LoopListener(ILogger logger, CancellationToken cancelToken)
7373
try { socketSession?.Close(); } catch { }
7474
sessionCancelTokenSource?.Cancel();
7575
}
76-
logger.LogInformation($"Session accepted {session.RemoteEndPoint}");
76+
logger.LogInformation($"Session accepted ({session.RemoteEndPoint})");
7777
sessionCancelTokenSource = new CancellationTokenSource();
7878
taskSession = Task.Factory.StartNew(() => LoopSession(logger, session, sessionCancelTokenSource.Token), TaskCreationOptions.LongRunning);
7979
socketSession = session;
@@ -99,27 +99,28 @@ private void LoopListener(ILogger logger, CancellationToken cancelToken)
9999
}
100100
}
101101

102-
private void LoopSession(ILogger logger, Socket client, CancellationToken cancelToken)
102+
private void LoopSession(ILogger logger, Socket socket, CancellationToken cancelToken)
103103
{
104+
string sessionID = socket.RemoteEndPoint?.ToString() ?? "Unknown";
104105
try
105106
{
106107
Span<byte> cmdBuf = stackalloc byte[1];
107108
while (true)
108109
{
109110
cancelToken.ThrowIfCancellationRequested();
110111
int read = 0;
111-
read = client.Receive(cmdBuf);
112+
read = socket.Receive(cmdBuf);
112113
if (read == 0)
113114
break;
114115

115116
byte cmd = cmdBuf[0];
116117
switch (cmd)
117118
{
118119
case (byte)'K':
119-
SendScopehalOld(client, cancelToken);
120+
SendScopehalOld(socket, cancelToken);
120121
break;
121122
case (byte)'S':
122-
SendScopehal(client, cancelToken);
123+
SendScopehal(socket, cancelToken);
123124
break;
124125
default:
125126
break;
@@ -137,7 +138,7 @@ private void LoopSession(ILogger logger, Socket client, CancellationToken cancel
137138
}
138139
finally
139140
{
140-
logger.LogInformation($"Session dropped");
141+
logger.LogInformation($"Session dropped ({sessionID})");
141142
socketSession = null;
142143
}
143144
}

0 commit comments

Comments
 (0)