@@ -578,6 +578,7 @@ private void StartDaemonProcess()
578578/// </summary>
579579private async Task StopDaemon ( CancellationToken ct )
580580{
581+ _logger . LogDebug ( "stopping mutagen daemon" ) ;
581582var process = _daemonProcess ;
582583var client = _mutagenClient ;
583584var writer = _logWriter ;
@@ -590,28 +591,34 @@ private async Task StopDaemon(CancellationToken ct)
590591if ( client == null )
591592{
592593if ( process == null ) return ;
594+ _logger . LogDebug ( "no client; killing daemon process" ) ;
593595process . Kill ( true ) ;
594596}
595597else
596598{
597599try
598600{
601+ _logger . LogDebug ( "sending DaemonTerminateRequest" ) ;
599602await client . Daemon . TerminateAsync ( new DaemonTerminateRequest ( ) , cancellationToken : ct ) ;
600603}
601- catch
604+ catch ( Exception e )
602605{
606+ _logger . LogError ( e , "failed to gracefully terminate agent" ) ;
603607if ( process == null ) return ;
608+ _logger . LogDebug ( "killing daemon process after failed graceful termination" ) ;
604609process . Kill ( true ) ;
605610}
606611}
607612
608613if ( process == null ) return ;
609614var cts = CancellationTokenSource . CreateLinkedTokenSource ( ct ) ;
610615cts . CancelAfter ( TimeSpan . FromSeconds ( 5 ) ) ;
616+ _logger . LogDebug ( "waiting for process to exit" ) ;
611617await process . WaitForExitAsync ( cts . Token ) ;
612618}
613619finally
614620{
621+ _logger . LogDebug ( "cleaning up daemon process objects" ) ;
615622client ? . Dispose ( ) ;
616623process ? . Dispose ( ) ;
617624writer ? . Dispose ( ) ;