Merge pull request #274 from rwaffen/deb_timeout

feat: set timeout for apt like with dnf and zypper

Author: rwaffen

REFERENCE.md

@@ -359,7 +359,7 @@ Should the server reboot after patching has been applied? (Defaults to 'never')
 
 ##### `timeout`
 
-Data type: `Optional[Integer]`
+Data type: `Integer`
 
 How many seconds should we wait until timing out the patch run? (Defaults to 3600 seconds)
 

tasks/patch_server.json

@@ -19,7 +19,8 @@
     },
     "timeout": {
       "description": "How many seconds should we wait until timing out the patch run? (Defaults to 3600 seconds)",
-      "type": "Optional[Integer]"
+      "type": "Integer",
+      "default": 3600
     },
     "security_only": {
       "description": "Limit patches to those tagged as security related? (Defaults to false)",

tasks/patch_server.rb

@@ -429,14 +429,11 @@ def gather_facts(log, starttime)
   err('110', 'os_patching/zypper_params', 'Unsafe content in zypper_params', starttime)
 end
 # Set the timeout for the patch run
-if params['timeout']
-  if params['timeout'] > 0
-    timeout = params['timeout']
-  else
-    err('121', 'os_patching/timeout', "timeout set to #{timeout} seconds - invalid", starttime)
-  end
+
+if params['timeout'].positive?
+  timeout = params['timeout']
 else
-  timeout = 3600
+  err('121', 'os_patching/timeout', "timeout set to #{timeout} seconds - invalid", starttime)
 end
 
 # Is the patching blocker flag set?
@@ -573,8 +570,6 @@ def gather_facts(log, starttime)
   log.info 'Patching complete'
 elsif os['family'] == 'Debian'
   # Are we doing security only patching?
-  apt_mode = ''
-  pkg_list = []
   if security_only == true
     pkg_list = os_patching['security_package_updates']
     apt_mode = 'install ' + pkg_list.join(' ')
@@ -587,8 +582,8 @@ def gather_facts(log, starttime)
   log.debug "Running apt #{apt_mode}"
   deb_front = 'DEBIAN_FRONTEND=noninteractive'
   deb_opts = '-o Apt::Get::Purge=false -o Dpkg::Options::=--force-confold -o Dpkg::Options::=--force-confdef --no-install-recommends'
-  apt_std_out, stderr, status = Open3.capture3("#{deb_front} apt-get #{dpkg_params} -y #{deb_opts} #{apt_mode}")
-  err(status, 'os_patching/apt', stderr, starttime) if status != 0
+  apt_std_out, status = run_with_timeout("#{deb_front} apt-get #{dpkg_params} -y #{deb_opts} #{apt_mode}", timeout, 2)
+  err(status, 'os_patching/apt', apt_std_out, starttime) if status != 0
 
   output('Success', reboot, security_only, 'Patching complete', pkg_list, apt_std_out, '', pinned_pkgs, starttime, log)
   log.info 'Patching complete'