nfagent 0.9.6 → 0.9.8

data/lib/nfagent.rb

@@ -30,5 +30,5 @@ require 'nfagent/server'
 require 'nfagent/cli'
 
 module NFAgent
-  VERSION = '0.9.6'
+  VERSION = '0.9.8'
 end

data/lib/nfagent/client.rb

@@ -6,7 +6,7 @@ module NFAgent
       proxy_class = Net::HTTP::Proxy(Config.proxy.host, Config.proxy.port, Config.proxy.user, Config.proxy.password)
       # TODO: Enable SSL
       proxy_class.start(SERVICE_HOST, 80) do |http|
-        http.read_timeout = 240 # 4 minutes TODO: Make this a config option with 240 as default
+        http.read_timeout = 120 # 2 minutes TODO: Make this a config option with 120 as default
         req = Net::HTTP::Post.new("/#{end_point}")
         req.set_form_data(data_hash.merge("key" => Config.client_key))
         ClientResponse.new do |resp|

data/lib/nfagent/server.rb

@@ -13,11 +13,7 @@ module NFAgent
         EM::PeriodicTimer.new(120) do
           poller.send_heartbeat
         end
-        EM::fork_reactor do
-          EM::PeriodicTimer.new(60) do
-            Submitter.resubmit_failed_dumps
-          end
-        end
+        Submitter.run_every(60)
       }
     end
 

data/lib/nfagent/submitter.rb

@@ -22,6 +22,18 @@ module NFAgent
       end
     end
 
+    # Actually runs the submitter
+    # every 'seconds' seconds after
+    # the last one completes
+    def self.run_every(seconds)
+      callback = proc { run_every(seconds) }
+      EM::add_timer(seconds) do
+        EM::defer(nil, callback) do
+          resubmit_failed_dumps
+        end
+      end
+    end
+
     # TODO: Change attempt logic
     # Add the next timestamp for when submission should be attenpted again to the end of the filename 
     def self.resubmit_failed_dumps

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - Daniel Draper