smart_proxy_openscap 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66166081c04c172ed14641a8d6a91297b62e282e
-  data.tar.gz: 90f5415c44875a56d909ecd1fa6a643a4e7641af
+  metadata.gz: a3045f38873e1f2bcde54bde9421175602bb9f34
+  data.tar.gz: 24414ceac6a0c7d5a3462d2de1ab11e6a45f5806
 SHA512:
-  metadata.gz: 5fb6cb5c0749fc59afb091bf8b1febf908fb77234c6b99bbaeaf5acdbc1aa4b410df63b641b49c461aa61cb381675ec0d3aa55ac0e274bac1d9b78fa84e11627
-  data.tar.gz: 2f2ee200b535c56397fbfee9bbc73ac5391f7879f2a2b2e36640acc3ca8b47a892a1e2aec1bb1cf7f4ff0c377a9b06c40a9bcaa7eb19cc89a2dffebf805eea50
+  metadata.gz: d1cceeb3e1ed7a8e469fafef6f703a89db4352d22d6f765dd6455fea2ed097addd0bee56c08495b210b78039d2960e715e0c08d547c95c3cf6584dca7072db90
+  data.tar.gz: 498837268ecc6d1c12bdf4906fda81ade22b1846358acc84a5813dd7e3242d5086805cda2b637b417cee04d47fcc48fbcbb6344499dcfca31dd954d102fa1a38

data/bin/smart-proxy-openscap-send

@@ -38,7 +38,7 @@ end
 begin
   Proxy::OpenSCAP::send_spool_to_foreman
 rescue StandardError => e
-  logger.debug e.backtrace.join("\n\t")
-  logger.error "Failed to send SCAP results to the Foreman server: #{e}"
+  logger.error "#{e}
+  puts "#{e} See #{Proxy::OpenSCAP.fullpath(Proxy::OpenSCAP::Plugin.settings.openscap_send_log_file)}"
   exit false
 end

data/extra/smart-proxy-openscap-send.cron

@@ -1,2 +1,2 @@
 # Send all collected OpenSCAP reports once every 30 minutes
-*/30 * * * * foreman-proxy smart-proxy-openscap-send >>/var/log/foreman-proxy/cron.log 2>&1
+*/30 * * * * foreman-proxy smart-proxy-openscap-send >> /var/log/foreman-proxy/cron.log

data/lib/smart_proxy_openscap/openscap_version.rb

@@ -10,6 +10,6 @@
 
 module Proxy
   module OpenSCAP
-    VERSION = '0.5.1'
+    VERSION = '0.5.3'
   end
 end

data/lib/smart_proxy_openscap/spool_forwarder.rb

@@ -3,11 +3,19 @@ module Proxy::OpenSCAP
     include ::Proxy::Log
 
     def post_arf_from_spool(arf_dir)
+      failed = nil
       Dir.foreach(arf_dir) do |cname|
-        next if cname == '.' || cname == '..'
-        cname_dir = File.join(arf_dir, cname)
-        forward_cname_dir(cname, cname_dir) if File.directory?(cname_dir)
+        begin
+          next if cname == '.' || cname == '..'
+          cname_dir = File.join(arf_dir, cname)
+          forward_cname_dir(cname, cname_dir) if File.directory?(cname_dir)
+        rescue StandardError => e
+          logger.debug e.backtrace.join("\n\t") 
+          logger.error "Failed to send SCAP results for #{cname} to the Foreman server: #{e}" 
+          failed = true
+        end
       end
+      raise "Failed to send SCAP results for one or more hosts." if failed
     end
 
     private

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_openscap
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
-- "Šimon Lukašík"
+- Šimon Lukašík
 - Shlomi Zadok
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake