Merge pull request #1483 from opscode/CHEF-4600

Chef 4600

1 files changed, 17 insertions, 4 deletions

diff --git a/lib/chef/resource/service.rb b/lib/chef/resource/service.rb
index 94eca259f0..4d64c3e3f4 100644
--- a/lib/chef/resource/service.rb
+++ b/lib/chef/resource/service.rb
@@ -42,6 +42,7 @@ class Chef
         @reload_command = nil
         @init_command = nil
         @priority = nil
+        @timeout = nil
         @action = "nothing"
         @supports = { :restart => false, :reload => false, :status => false }
         @allowed_actions.push(:enable, :disable, :start, :stop, :restart, :reload)
@@ -154,16 +155,28 @@ class Chef
       #   similar for other runlevels
       #
       def priority(arg=nil)
-        set_or_return(:priority,
-                      arg,
-                      :kind_of => [ Integer, String, Hash ])
+        set_or_return(
+          :priority,
+          arg,
+          :kind_of => [ Integer, String, Hash ]
+        )
+      end
+
+      # timeout only applies to the windows service manager
+      def timeout(arg=nil)
+        set_or_return(
+          :timeout,
+          arg,
+          :kind_of => Integer
+        )
       end
 
       def parameters(arg=nil)
         set_or_return(
           :parameters,
           arg,
-          :kind_of => [ Hash ] )
+          :kind_of => [ Hash ]
+        )
       end
 
       def supports(args={})