Adds possibility to configure failure flag

chef · Jan 25, 2023 · 1810eca · 1810eca
1 parent 67a0f7a
commit 1810eca
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/lib/win32/service.rb b/lib/win32/service.rb
@@ -272,6 +272,7 @@ class Service
     # * failure_command        => nil,
     # * failure_actions        => nil,
     # * failure_delay          => 0
+    # * failure_flag           => nil
     #
     # Example:
     #
@@ -317,6 +318,7 @@ def initialize(options = {})
         "failure_command"        => nil,
         "failure_actions"        => nil,
         "failure_delay"          => 0,
+        "failure_flag"           => nil,
         "host"                   => nil,
         "service_name"           => nil,
       }
@@ -396,7 +398,7 @@ def initialize(options = {})
         end
 
         if opts["failure_reset_period"] || opts["failure_reboot_message"] ||
-            opts["failure_command"] || opts["failure_actions"]
+            opts["failure_command"] || opts["failure_actions"] || opts["failure_flag"]
           self.class.configure_failure_actions(handle_scs, opts)
         end
       ensure
@@ -425,6 +427,7 @@ def initialize(options = {})
     # * failure_reboot_message
     # * failure_command
     # * failure_actions
+    # * failure_flag
     # * failure_delay
     #
     # Examples:
@@ -475,6 +478,7 @@ def self.configure(options = {})
         "failure_command"        => nil,
         "failure_actions"        => nil,
         "failure_delay"          => 0,
+        "failure_flag"           => nil,
         "service_name"           => nil,
         "host"                   => nil,
         "delayed_start"          => false,
@@ -579,7 +583,7 @@ def self.configure(options = {})
         end
 
         if opts["failure_reset_period"] || opts["failure_reboot_message"] ||
-            opts["failure_command"] || opts["failure_actions"]
+            opts["failure_command"] || opts["failure_actions"] || opts["failure_flag"]
           configure_failure_actions(handle_scs, opts)
         end
       ensure
@@ -1397,6 +1401,18 @@ def self.configure_failure_actions(handle_scs, opts)
         close_service_handle(handle_scs)
         raise SystemCallError.new("ChangeServiceConfig2", error)
       end
+
+      unless opts["failure_flag"].nil?
+        sfaf = SERVICE_FAILURE_ACTIONS_FLAG.new
+        sfaf[:fFailureActionsOnNonCrashFailures] = opts["failure_flag"] ? 1 : 0
+        bool = ChangeServiceConfig2(
+          handle_scs,
+          SERVICE_CONFIG_FAILURE_ACTIONS_FLAG,
+          sfaf
+        )
+
+        FFI.raise_windows_error("ChangeServiceConfig2") unless bool
+      end
     end
 
     # Returns a human readable string indicating the action type.

diff --git a/lib/win32/windows/structs.rb b/lib/win32/windows/structs.rb
@@ -90,6 +90,12 @@ class SERVICE_FAILURE_ACTIONS < FFI::Struct
       )
     end
 
+    class SERVICE_FAILURE_ACTIONS_FLAG < FFI::Struct
+      layout(
+        :fFailureActionsOnNonCrashFailures, :int
+      )
+    end
+
     class SERVICE_TABLE_ENTRY < FFI::Struct
       layout(
         :lpServiceName, :pointer,