onering-client 0.1.4 → 0.1.5

data/lib/onering/cli/reporter.rb

@@ -43,7 +43,14 @@ EOS
       end
 
       def self.run(args)
-        report = _report()
+      # saving, by default, should not use the cache (but should update it to keep it fresh)
+        if @opts[:save] === true or args[0] == 'save'
+          report = _report({
+            :cacheregen => true
+          })
+        else
+          report = _report()
+        end
         
       # pull overrides from CLI arguments
         @opts[:fields].each do |field|
@@ -98,10 +105,10 @@ EOS
         end
       end
 
-      def self._report()
+      def self._report(options={})
         begin
           Onering::Logger.debug("Gathering local data for report", "Onering::CLI::Report")
-          report = Onering::Reporter.report().stringify_keys()
+          report = Onering::Reporter.report(options).stringify_keys()
 
         # pull report overrides from the config file
           Onering::Config.get('reporter.fields',{}).each do |key, value|

data/lib/onering/plugins/reporter.rb

@@ -142,14 +142,15 @@ module Onering
         end
       end
 
-      def report()
+      def report(options={})
+        options = @options.merge(options)
         @id = (@options[:id] || Onering::Util.fact('hardwareid', nil))
 
         if not @id.nil?
-          if @options[:nocache]
+          if options[:nocache]
             return _generated_report()
           else
-            rv = _cached_report()
+            rv = _cached_report(options)
             return _generated_report() if rv.nil? or rv.empty?
             return rv
           end
@@ -184,20 +185,35 @@ module Onering
         return {}
       end
 
-      def _cached_report()
-        cachefile = (@options[:cachefile] || DEFAULT_CACHE_FILE)
+      def _cached_report(options={})
+        options = @options.merge(options)
+        cachefile = (options[:cachefile] || DEFAULT_CACHE_FILE)
+        tries = 0
 
         catch(:retry) do
+          tries += 1
+
+          if tries > 10
+            Onering::Logger.error("Too many retries reading cache #{cachefile}, generating report", "Onering::Reporter")
+            return _generated_report()
+          end
+
           if File.readable?(cachefile)
             Onering::Logger.debug("Loading cache file at #{cachefile}", "Onering::Reporter")
             cache = File.read(cachefile)
             cache = (MultiJson.load(cache) rescue {})
 
-            if _cache_expired?(cache, @options[:maxage])
-              Onering::Logger.debug("Cache expired, regenerating...", "Onering::Reporter")
+            if _cache_expired?(cache, options[:maxage])
+              Onering::Logger.debug("Cache expired, regenerating", "Onering::Reporter")
               throw :retry if _update_cache_file(cachefile)  
             end
 
+            if options[:cacheregen] == true
+              Onering::Logger.debug("Forcing cache regeneration", "Onering::Reporter")
+              _update_cache_file(cachefile)
+              return _generated_report()
+            end
+
           # remove cached_at key
             Onering::Logger.debug("Using cached data (#{Time.now.to_i - Time.parse(cache.get('cached_at')).to_i} seconds old)", "Onering::Reporter")
             cache.delete('cached_at')

data/lib/onering.rb

@@ -2,7 +2,7 @@ $: << File.expand_path(File.dirname(__FILE__))
 
 module Onering
   module Client
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
 
     class Error < Exception; end
     class FatalError < Error; end

metadata

@@ -2,7 +2,7 @@
 name: onering-client
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Gary Hetzel