choria-mcorpc-support 2.26.0 → 2.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4edceb07e1b046286da6d475f5bea4391a6851b8e49e82af7373a151b476755a
-  data.tar.gz: 37e7c6e320f2742a9dd2722ad2531dd710745880ad09926f15d554ebe3fefb88
+  metadata.gz: d38a022de3a9f8e30351c3281d34011f84d792d09f13955b705ff2ff5502140b
+  data.tar.gz: a3a5ce9b97f9b479b7530b7af1645a20049a15d4dbc2f6159539c6731c441eee
 SHA512:
-  metadata.gz: 11c2d30b7266823e70ed2d865d453c4f43ce5f0dc326bd7a963774240ccda4151d863f22ae327ec2f5e073df92cdf50af1b888c7a799e1967000ce497ff00bfc
-  data.tar.gz: 5ca64410539e9f6b984c084b20e13f1d049e23e2677c533fa2a1b0c7c7966c2df340d6918a35a8b45013785a32ef66cc777c5237adfb382213232c2c1c20c02e
+  metadata.gz: 95d4ad08da80cccbb2f4904764bb4285ada306dc023cc922543cafe89aaf66eabf04ddda44e1b1290b9a212bb66a44430009e8d48c135382a7c830b9d89a3f7a
+  data.tar.gz: 99a3586fc1327ae2597a642c9105c3418622fc0c058977ec0b95ea6dbbbd75af215fb1fee66e023c97b61d72d7207c23a87cc41d6680aa5ef2c1520eb8a910e6

data/lib/mcollective/application/tasks.rb

@@ -213,7 +213,9 @@ Examples:
             Util.colorize(:bold, bolt_tasks.ddl.meta[:timeout])
           ])
 
-          request_and_report(:run_and_wait, request)
+          success = request_and_report(:run_and_wait, request)
+
+          exit(success ? 0 : 1)
         end
       ensure
         reset_client!
@@ -273,11 +275,15 @@ Examples:
         else
           say("Requesting task status for request %s, showing failures only pass --verbose for all output" % Util.colorize(:bold, taskid)) unless options[:verbose]
 
-          request_and_report(:task_status, {:task_id => taskid}, taskid)
+          success = request_and_report(:task_status, {:task_id => taskid}, taskid)
+
+          exit(success ? 0 : 1)
         end
       end
 
       def request_and_report(action, arguments, taskid=nil) # rubocop:disable Metrics/MethodLength
+        res = true
+
         task_not_known_nodes = 0
         wrapper_failure = 0
         completed_nodes = 0
@@ -302,16 +308,24 @@ Examples:
           status = reply[:data]
 
           if reply[:statuscode] == 3
+            res = false
             fail_nodes += 1
             task_not_known_nodes += 1
           elsif [-1, 0].include?(status[:exitcode])
             status[:completed] ? completed_nodes += 1 : running_nodes += 1
             runtime += status[:runtime]
-            reply[:statuscode] == 0 ? success_nodes += 1 : fail_nodes += 1
+            if reply[:statuscode] == 0
+              success_nodes += 1
+            else
+              res = false
+              fail_nodes += 1
+            end
           elsif reply[:statuscode] == 5
+            res = false
             wrapper_failure += 1
             fail_nodes += 1
           else
+            res = false
             fail_nodes += 1
           end
 
@@ -351,6 +365,8 @@ Examples:
           runtime,
           bolt_tasks.stats
         )
+
+        res
       ensure
         reset_client!
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: choria-mcorpc-support
 version: !ruby/object:Gem::Version
-  version: 2.26.0
+  version: 2.26.1
 platform: ruby
 authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 2.7.6.3
 signing_key: 
 specification_version: 4
 summary: Support libraries the Choria Server