Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Updater occasionally killed Sonarr twice before allowing it to be restarted by upstart. 

Fixed: Updater killed itself during update on debian jessie.
This commit is contained in:
Taloth Saldono 2015-07-08 20:54:47 +02:00
parent 103de770c3
commit 1eb6629088
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/NzbDrone.Common/Processes/ProcessProvider.cs
View File

@ -244,6 +244,12 @@ namespace NzbDrone.Common.Processes
foreach (var processInfo in processes) foreach (var processInfo in processes)
{ {
if (processInfo.Id == Process.GetCurrentProcess().Id)
{
_logger.Debug("Tried killing own process, skipping: {0} [{1}]", processInfo.Id, processInfo.ProcessName);
continue;
}
_logger.Debug("Killing process: {0} [{1}]", processInfo.Id, processInfo.ProcessName); _logger.Debug("Killing process: {0} [{1}]", processInfo.Id, processInfo.ProcessName);
Kill(processInfo.Id); Kill(processInfo.Id);
} }
@ -306,6 +312,18 @@ namespace NzbDrone.Common.Processes
_logger.Debug("Found {0} processes with the name: {1}", processes.Count, name); _logger.Debug("Found {0} processes with the name: {1}", processes.Count, name);
try
{
foreach (var process in processes)
{
_logger.Debug(" - [{0}] {1}", process.Id, process.ProcessName);
}
}
catch
{
// Don't crash on gettings some log data.
}
return processes; return processes;
} }

3
src/NzbDrone.Update/UpdateEngine/InstallUpdateService.cs
View File

@ -82,6 +82,9 @@ namespace NzbDrone.Update.UpdateEngine
try try
{ {
_processProvider.FindProcessByName(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME);
_processProvider.FindProcessByName(ProcessProvider.NZB_DRONE_PROCESS_NAME);
if (OsInfo.IsWindows) if (OsInfo.IsWindows)
{ {
_terminateNzbDrone.Terminate(processId); _terminateNzbDrone.Terminate(processId);

15
src/NzbDrone.Update/UpdateEngine/TerminateNzbDrone.cs
View File

@ -44,16 +44,21 @@ namespace NzbDrone.Update.UpdateEngine
_logger.ErrorException("couldn't stop service", e); _logger.ErrorException("couldn't stop service", e);
} }
} }
}
else
{
_processProvider.Kill(processId);
}
_logger.Info("Killing all running processes"); _logger.Info("Killing all running processes");
_processProvider.KillAll(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME); _processProvider.KillAll(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME);
_processProvider.KillAll(ProcessProvider.NZB_DRONE_PROCESS_NAME); _processProvider.KillAll(ProcessProvider.NZB_DRONE_PROCESS_NAME);
} }
else
{
_logger.Info("Killing all running processes");
_processProvider.KillAll(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME);
_processProvider.KillAll(ProcessProvider.NZB_DRONE_PROCESS_NAME);
_processProvider.Kill(processId);
}
}
} }
} }