Enable chef-client windows_service to stop in a timely manner when splay is configured with a high number.

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb
index d3493d8a47..42a9ee9783 100644
--- a/lib/chef/application/windows_service.rb
+++ b/lib/chef/application/windows_service.rb
@@ -65,7 +65,9 @@ class Chef
       end
 
       def service_main(*startup_parameters)
-        timeout = 0
+        # Chef::Config is initialized during service_init
+        # Set the initial timeout to splay sleep time
+        timeout = rand Chef::Config[:splay]
 
         while running? do
           # Grab the service_action_mutex to make a chef-client run
@@ -83,10 +85,7 @@ class Chef
               timeout = Chef::Config[:interval]
 
               # Honor splay sleep config
-
-              splay = rand Chef::Config[:splay]
-              Chef::Log.debug("Splay sleep #{splay} seconds")
-              sleep splay
+              timeout += rand Chef::Config[:splay]
 
               # run chef-client only if service is in RUNNING state
               next if state != RUNNING