ydeng/gameservicewarden
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added disposing of currently waiting pipe and connected log listeners.

Browse Source 
These changes fix the problem with service descriptor being unable to stop on Linux.
This commit is contained in:
Harrison Deng 2021-04-15 21:14:16 -05:00
parent 911724627e
commit a0775fdf8e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/GameServiceWarden.Core/Games/ServiceDescriptor.cs
View File

@ -39,7 +39,7 @@ namespace GameServiceWarden.Core.Games
private volatile NamedPipeClientStream logSender; private volatile NamedPipeClientStream logSender;
private ConcurrentStack<NamedPipeServerStream> logStreamListeners; private ConcurrentStack<NamedPipeServerStream> logStreamListeners;
private Task logUpdateTask; private Task logUpdateTask;
private Task acceptingTask; private Task listenTask;
private volatile CancellationTokenSource stopToken; private volatile CancellationTokenSource stopToken;
private NamedPipeServerStream acceptingPipe; private NamedPipeServerStream acceptingPipe;
@ -99,7 +99,7 @@ namespace GameServiceWarden.Core.Games
initializationTask.Wait(); initializationTask.Wait();
cancellationTokenSource.Dispose(); cancellationTokenSource.Dispose();
stopToken = new CancellationTokenSource(); stopToken = new CancellationTokenSource();
acceptingTask = AcceptLogConnections(); listenTask = AcceptLogConnections();
logUpdateTask = BroadcastLog(); logUpdateTask = BroadcastLog();
} }
@ -113,13 +113,18 @@ namespace GameServiceWarden.Core.Games
Logger.Log($"\"{ServiceName}\" is stopping."); Logger.Log($"\"{ServiceName}\" is stopping.");
service.ElegantShutdown(); service.ElegantShutdown();
stopToken.Cancel(); // Doesn't work on Linux(?) stopToken.Cancel(); // Doesn't work on Linux(?)
acceptingPipe.Close();
acceptingPipe.Dispose(); //Handles Linux case acceptingPipe.Dispose(); //Handles Linux case
logSender.Dispose(); //Makes sure logging client is disposed logSender.Dispose(); //Makes sure logging client is disposed
logReceiver.Dispose(); //Closes receiver (Linux doesn't respond to cancellations, needed to dispose either way). logReceiver.Dispose(); //Closes receiver (Linux doesn't respond to cancellations, needed to dispose either way).
NamedPipeServerStream terminatingPipe;
while (logStreamListeners.TryPop(out terminatingPipe))
{
terminatingPipe.Dispose(); // Required before waiting since this is under listenTask.
}
try try
{ {
if (!acceptingTask.Wait(TIMEOUT)) { if (!listenTask.Wait(TIMEOUT)) {
throw new TimeoutException($"Could not stop \"{ServiceName}\" accepting task within {TIMEOUT}ms."); throw new TimeoutException($"Could not stop \"{ServiceName}\" accepting task within {TIMEOUT}ms.");
} }
} }
@ -137,11 +142,6 @@ namespace GameServiceWarden.Core.Games
{ {
e.Handle((exception) => exception is TaskCanceledException || exception is SocketException); //Same as above. e.Handle((exception) => exception is TaskCanceledException || exception is SocketException); //Same as above.
} }
foreach (NamedPipeServerStream pipe in logStreamListeners)
{
pipe.Dispose();
}
logStreamListeners.Clear();
stopToken.Dispose(); stopToken.Dispose();
} }