nfagent 0.9.5 → 0.9.6

data/Rakefile

@@ -11,7 +11,7 @@ $hoe = Hoe.spec('nfagent') do |p|
   p.post_install_message = 'PostInstall.txt'
   p.rubyforge_name       = p.name
   p.extra_deps         = [
-    ['svutil','>= 0.0.6'], ['eventmachine', '>= 0.12.8']
+    ['svutil','>= 0.0.11'], ['eventmachine', '>= 0.12.8']
   ]
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"]

data/lib/nfagent.rb

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

data/lib/nfagent/client.rb

@@ -6,13 +6,15 @@ 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
         req = Net::HTTP::Post.new("/#{end_point}")
         req.set_form_data(data_hash.merge("key" => Config.client_key))
         ClientResponse.new do |resp|
           resp.response, resp.message = http.request(req)
         end
       end
-    rescue
+    rescue Exception => e
+      # Trap Exception class here to ensure we catch Timeout
       ClientResponse.new do |resp|
         resp.message = $!
       end

data/lib/nfagent/server.rb

@@ -6,21 +6,23 @@ module NFAgent
       poller = Poller.new
 
       EM.run {
+        EM.start_server "0.0.0.0", 10000, Event, chunk_handler, poller
         EM::PeriodicTimer.new(5) do
           chunk_handler.check_full_or_expired
         end
-        EM::PeriodicTimer.new(60) do
-          Submitter.resubmit_failed_dumps
-        end
         EM::PeriodicTimer.new(120) do
           poller.send_heartbeat
         end
-        EM.start_server "0.0.0.0", 10000, Event, chunk_handler, poller
+        EM::fork_reactor do
+          EM::PeriodicTimer.new(60) do
+            Submitter.resubmit_failed_dumps
+          end
+        end
       }
     end
 
     def shutdown
-      EM::stop_event_loop
+      EM::stop_event_loop if EM::reactor_running?
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Daniel Draper
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 +09:30
+date: 2010-07-24 00:00:00 +09:30
 default_executable: nfagent
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 0
-        - 6
-        version: 0.0.6
+        - 11
+        version: 0.0.11
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -68,9 +68,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 4
+        - 6
         - 0
-        version: 2.4.0
+        version: 2.6.0
   type: :development
   version_requirements: *id004
 description: Logging Agent for NetFox Online