.

Author: TingluoHuang

src/Runner.Listener/Runner.cs

@@ -32,7 +32,6 @@ public sealed class Runner : RunnerService, IRunner
         private bool _inConfigStage;
         private ManualResetEvent _completedCommand = new(false);
         private IRunnerServer _runnerServer;
-        private RunnerSettings _runnerSettings;
 
         // <summary>
         // Helps avoid excessive calls to Run Service when encountering non-retriable errors from /acquirejob.
@@ -52,7 +51,7 @@ public override void Initialize(IHostContext hostContext)
         {
             base.Initialize(hostContext);
             _term = HostContext.GetService<ITerminal>();
-            _acquireJobThrottler = HostContext.GetService<IErrorThrottler>();
+            _acquireJobThrottler = HostContext.CreateService<IErrorThrottler>();
             _runnerServer = HostContext.GetService<IRunnerServer>();
         }
 
@@ -255,7 +254,7 @@ public async Task<int> ExecuteCommand(CommandSettings command)
                     }
                 }
 
-                _runnerSettings = configManager.LoadSettings();
+                RunnerSettings settings = configManager.LoadSettings();
 
                 var store = HostContext.GetService<IConfigurationStore>();
                 bool configuredAsService = store.IsServiceConfigured();
@@ -304,7 +303,7 @@ public async Task<int> ExecuteCommand(CommandSettings command)
                     }
 
                     // Run the runner interactively or as service
-                    return await RunAsync(_runnerSettings, command.RunOnce || _runnerSettings.Ephemeral);
+                    return await RunAsync(settings, command.RunOnce || settings.Ephemeral);
                 }
                 else
                 {

src/Test/L0/Listener/RunnerL0.cs

@@ -69,7 +69,7 @@ public async Task TestRunAsync()
                 hc.SetSingleton<IPromptManager>(_promptManager.Object);
                 hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
                 hc.SetSingleton<IConfigurationStore>(_configStore.Object);
-                hc.SetSingleton<IErrorThrottler>(_acquireJobThrottler.Object);
+                hc.EnqueueInstance<IErrorThrottler>(_acquireJobThrottler.Object);
                 runner.Initialize(hc);
                 var settings = new RunnerSettings
                 {
@@ -178,7 +178,7 @@ public async Task TestExecuteCommandForRunAsService(string[] args, bool configur
                 hc.SetSingleton<IMessageListener>(_messageListener.Object);
                 hc.SetSingleton<IConfigurationStore>(_configStore.Object);
                 hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-                hc.SetSingleton<IErrorThrottler>(_acquireJobThrottler.Object);
+                hc.EnqueueInstance<IErrorThrottler>(_acquireJobThrottler.Object);
 
                 var command = new CommandSettings(hc, args);
 
@@ -211,7 +211,7 @@ public async Task TestMachineProvisionerCLI()
                 hc.SetSingleton<IMessageListener>(_messageListener.Object);
                 hc.SetSingleton<IConfigurationStore>(_configStore.Object);
                 hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-                hc.SetSingleton<IErrorThrottler>(_acquireJobThrottler.Object);
+                hc.EnqueueInstance<IErrorThrottler>(_acquireJobThrottler.Object);
 
                 var command = new CommandSettings(hc, new[] { "run" });
 
@@ -249,7 +249,7 @@ public async Task TestRunOnce()
                 hc.SetSingleton<IPromptManager>(_promptManager.Object);
                 hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
                 hc.SetSingleton<IConfigurationStore>(_configStore.Object);
-                hc.SetSingleton<IErrorThrottler>(_acquireJobThrottler.Object);
+                hc.EnqueueInstance<IErrorThrottler>(_acquireJobThrottler.Object);
                 runner.Initialize(hc);
                 var settings = new RunnerSettings
                 {
@@ -346,7 +346,7 @@ public async Task TestRunOnceOnlyTakeOneJobMessage()
                 hc.SetSingleton<IPromptManager>(_promptManager.Object);
                 hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
                 hc.SetSingleton<IConfigurationStore>(_configStore.Object);
-                hc.SetSingleton<IErrorThrottler>(_acquireJobThrottler.Object);
+                hc.EnqueueInstance<IErrorThrottler>(_acquireJobThrottler.Object);
                 runner.Initialize(hc);
                 var settings = new RunnerSettings
                 {
@@ -448,7 +448,7 @@ public async Task TestRunOnceHandleUpdateMessage()
                 hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
                 hc.SetSingleton<IConfigurationStore>(_configStore.Object);
                 hc.SetSingleton<ISelfUpdater>(_updater.Object);
-                hc.SetSingleton<IErrorThrottler>(_acquireJobThrottler.Object);
+                hc.EnqueueInstance<IErrorThrottler>(_acquireJobThrottler.Object);
 
                 runner.Initialize(hc);
                 var settings = new RunnerSettings
@@ -533,7 +533,7 @@ public async Task TestRemoveLocalRunnerConfig()
                 hc.SetSingleton<IConfigurationStore>(_configStore.Object);
                 hc.SetSingleton<IPromptManager>(_promptManager.Object);
                 hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-                hc.SetSingleton<IErrorThrottler>(_acquireJobThrottler.Object);
+                hc.EnqueueInstance<IErrorThrottler>(_acquireJobThrottler.Object);
 
                 var command = new CommandSettings(hc, new[] { "remove", "--local" });