From 571998e70e0b449724b37dc931cead1e3b1a6390 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sun, 13 Nov 2011 20:22:53 -0800 Subject: [PATCH] better PID environment variable handling. --- NzbDrone.App.Test/IISProviderFixture.cs | 4 ++-- NzbDrone/Providers/IISProvider.cs | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/NzbDrone.App.Test/IISProviderFixture.cs b/NzbDrone.App.Test/IISProviderFixture.cs index 8938ab3f1..65c11abce 100644 --- a/NzbDrone.App.Test/IISProviderFixture.cs +++ b/NzbDrone.App.Test/IISProviderFixture.cs @@ -16,13 +16,13 @@ namespace NzbDrone.App.Test public class IISProviderFixture : TestBase { [Test] - public void should_not_set_env_varibles_twice() + public void should_update_pid_env_varibles() { WithTempAsAppPath(); var dummy = StartDummyProcess(); - Environment.SetEnvironmentVariable(EnviromentProvider.NZBDRONE_PID, "Test"); + Environment.SetEnvironmentVariable(EnviromentProvider.NZBDRONE_PID, "0"); Environment.SetEnvironmentVariable(EnviromentProvider.NZBDRONE_PATH, "Test"); Mocker.GetMock() diff --git a/NzbDrone/Providers/IISProvider.cs b/NzbDrone/Providers/IISProvider.cs index e58efec64..4b5ad3ef7 100644 --- a/NzbDrone/Providers/IISProvider.cs +++ b/NzbDrone/Providers/IISProvider.cs @@ -53,15 +53,9 @@ namespace NzbDrone.Providers startInfo.RedirectStandardError = true; startInfo.CreateNoWindow = true; - if (!startInfo.EnvironmentVariables.ContainsKey(EnviromentProvider.NZBDRONE_PATH)) - { - startInfo.EnvironmentVariables.Add(EnviromentProvider.NZBDRONE_PATH, _enviromentProvider.ApplicationPath); - } - if (!startInfo.EnvironmentVariables.ContainsKey(EnviromentProvider.NZBDRONE_PID)) - { - startInfo.EnvironmentVariables.Add(EnviromentProvider.NZBDRONE_PID, Process.GetCurrentProcess().Id.ToString()); - } + startInfo.EnvironmentVariables[EnviromentProvider.NZBDRONE_PATH] = _enviromentProvider.ApplicationPath; + startInfo.EnvironmentVariables[EnviromentProvider.NZBDRONE_PID] = Process.GetCurrentProcess().Id.ToString(); try {