May 14, 2025 · May 13, 2025
diff --git a/App/Services/MutagenController.cs b/App/Services/MutagenController.cs
 /// </summary>
 privateasyncTask<MutagenClient>EnsureDaemon(CancellationTokenct)
 {
 _logger.LogDebug("EnsureDaemon called");
 ObjectDisposedException.ThrowIf(_disposing,typeof(MutagenController));
 if(_mutagenClient!=null&&_daemonProcess!=null)
 return_mutagenClient;
 /// </summary>
 privateasyncTask<MutagenClient>StartDaemon(CancellationTokenct)
 {
 _logger.LogDebug("StartDaemon called");
 // Stop the running daemon
 if(_daemonProcess!=null)awaitStopDaemon(ct);

 // Attempt to stop any orphaned daemon
 try
 {
 _logger.LogDebug("creating MutagenClient to stop orphan");
 varclient=newMutagenClient(_mutagenDataDirectory);
 awaitclient.Daemon.TerminateAsync(newDaemonTerminateRequest(),cancellationToken:ct);
 }
 {
 // Mainline; no daemon running.
 }
 finally
 {
 _logger.LogDebug("finished with orphan mutagen client");
 }

 // If we get some failure while creating the log file or starting the process, we'll retry
 // it up to 5 times x 100ms. Those issues should resolve themselves quickly if they are
 ct.ThrowIfCancellationRequested();
 try
 {
 _logger.LogDebug("creating mainline mutagen client");
 varclient=newMutagenClient(_mutagenDataDirectory);
 _=awaitclient.Daemon.VersionAsync(newVersionRequest(),cancellationToken:ct);
 _mutagenClient=client;
diff --git a/MutagenSdk/MutagenClient.cs b/MutagenSdk/MutagenClient.cs

    public MutagenClient(string dataDir)
    {
        // Check for the lock file first, since it should exist if it's running.
        var daemonLockFile = Path.Combine(dataDir, "daemon", "daemon.lock");
        if (!File.Exists(daemonLockFile))
            throw new FileNotFoundException(
                "Mutagen daemon lock file not found, did the mutagen daemon start successfully?", daemonLockFile);

        // We should not be able to open the lock file.
        try
        {
            using var _ = File.Open(daemonLockFile, FileMode.Open, FileAccess.Write, FileShare.None);
            // We throw a FileNotFoundException if we could open the file because
            // it means the same thing and allows us to return the path nicely.
            throw new InvalidOperationException(
                $"Mutagen daemon lock file '{daemonLockFile}' is unlocked, did the mutagen daemon start successfully?");
        }
        catch (IOException)
        {
            // this is what we expect
        }

        // Read the IPC named pipe address from the sock file.
        var daemonSockFile = Path.Combine(dataDir, "daemon", "daemon.sock");
        if (!File.Exists(daemonSockFile))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -441,6 +441,7 @@ private async Task<SyncSessionControllerStateModel> UpdateState(MutagenClient cl
		/// </summary>
		privateasyncTask<MutagenClient>EnsureDaemon(CancellationTokenct)
		{
		_logger.LogDebug("EnsureDaemon called");
		ObjectDisposedException.ThrowIf(_disposing,typeof(MutagenController));
		if(_mutagenClient!=null&&_daemonProcess!=null)
		return_mutagenClient;
Expand DownExpand Up		@@ -479,12 +480,14 @@ private async Task<MutagenClient> EnsureDaemon(CancellationToken ct)
		/// </summary>
		privateasyncTask<MutagenClient>StartDaemon(CancellationTokenct)
		{
		_logger.LogDebug("StartDaemon called");
		// Stop the running daemon
		if(_daemonProcess!=null)awaitStopDaemon(ct);

		// Attempt to stop any orphaned daemon
		try
		{
		_logger.LogDebug("creating MutagenClient to stop orphan");
		varclient=newMutagenClient(_mutagenDataDirectory);
		awaitclient.Daemon.TerminateAsync(newDaemonTerminateRequest(),cancellationToken:ct);
		}
Expand All		@@ -496,6 +499,10 @@ private async Task<MutagenClient> StartDaemon(CancellationToken ct)
		{
		// Mainline; no daemon running.
		}
		finally
		{
		_logger.LogDebug("finished with orphan mutagen client");
		}

		// If we get some failure while creating the log file or starting the process, we'll retry
		// it up to 5 times x 100ms. Those issues should resolve themselves quickly if they are
Expand DownExpand Up		@@ -528,6 +535,7 @@ private async Task<MutagenClient> StartDaemon(CancellationToken ct)
		ct.ThrowIfCancellationRequested();
		try
		{
		_logger.LogDebug("creating mainline mutagen client");
		varclient=newMutagenClient(_mutagenDataDirectory);
		_=awaitclient.Daemon.VersionAsync(newVersionRequest(),cancellationToken:ct);
		_mutagenClient=client;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,26 +16,6 @@ public class MutagenClient : IDisposable

		public MutagenClient(string dataDir)
		{
		// Check for the lock file first, since it should exist if it's running.
		var daemonLockFile = Path.Combine(dataDir, "daemon", "daemon.lock");
		if (!File.Exists(daemonLockFile))
		throw new FileNotFoundException(
		"Mutagen daemon lock file not found, did the mutagen daemon start successfully?", daemonLockFile);

		// We should not be able to open the lock file.
		try
		{
		using var _ = File.Open(daemonLockFile, FileMode.Open, FileAccess.Write, FileShare.None);
		// We throw a FileNotFoundException if we could open the file because
		// it means the same thing and allows us to return the path nicely.
		throw new InvalidOperationException(
		$"Mutagen daemon lock file '{daemonLockFile}' is unlocked, did the mutagen daemon start successfully?");
		}
		catch (IOException)
		{
		// this is what we expect
		}

		// Read the IPC named pipe address from the sock file.
		var daemonSockFile = Path.Combine(dataDir, "daemon", "daemon.sock");
		if (!File.Exists(daemonSockFile))
Expand Down