nfagent 0.0.99 → 0.9.0

data/lib/nfagent.rb

@@ -24,5 +24,5 @@ require 'nfagent/server'
 require 'nfagent/cli'
 
 module NFAgent
-  VERSION = '0.0.99'
+  VERSION = '0.9.0'
 end

data/lib/nfagent/chunk.rb

@@ -27,10 +27,8 @@ module NFAgent
     end
 
     def dump
-      puts @array.join("\n")
       payload = Encoder.encode64url(Zlib::Deflate.deflate(@array.join("\n"), Zlib::BEST_COMPRESSION))
       checksum = Digest::SHA1.hexdigest(payload)
-      Log.info "Submitting chunk to server (#{checksum})"
       [ payload, checksum ]
     end
 

data/lib/nfagent/submitter.rb

@@ -7,8 +7,10 @@ module NFAgent
       @key = key
     end
 
-    def submit(payload, checksum)
-      puts "submitting paylod: #{payload}"
+    def submit(payload, checksum, options = {})
+      attempt = options[:attempt] || 1
+      raise "Delaying attempt" unless [ 1, 2, 4, 8, 16 ].include?(attempt)
+      puts "Submitting Payload: #{checksum}, Attempt #{attempt}, (#{payload.size + 1} bytes)"
       proxy_class = Net::HTTP::Proxy(Config.proxy.host, Config.proxy.port, Config.proxy.user, Config.proxy.password)
       proxy_class.start(@service_host, 80) do |http|
         req = Net::HTTP::Post.new('/collector')
@@ -18,11 +20,11 @@ module NFAgent
       end
     rescue
       Log.error "Submission Failed: #{$!}"
-      write_failed_dump(payload, checksum)
+      write_failed_dump(payload, checksum, attempt)
     end
 
-    def write_failed_dump(payload, checksum)
-      File.open(File.join(Config.dump_dir, checksum), "w") do |file|
+    def write_failed_dump(payload, checksum, attempt)
+      File.open(File.join(Config.dump_dir, "#{checksum}-#{attempt}"), "w") do |file|
         file << payload
       end
     end
@@ -40,14 +42,18 @@ module NFAgent
       submitter = Submitter.new(Config.client_key)
       dump_dir = Dir.new(Config.dump_dir)
       dump_dir.entries.select { |e| not e =~ /^\./ }.each do |entry|
-        Log.info "Resubmitting #{entry }"
+        dump_file, attempt = entry.split("-")
+        Log.info "Resubmitting #{entry}"
         payload = ""
         ref = File.join(dump_dir.path, entry)
         File.open(ref, "r") do |file|
           payload << file.read
         end
-        FileUtils.rm(ref)
-        submitter.submit(payload, entry)
+        FileUtils.rm_f(ref)
+        attempt = attempt.to_i + 1
+        if attempt <= 16
+          submitter.submit(payload, dump_file, :attempt => attempt)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: nfagent
 version: !ruby/object:Gem::Version 
-  version: 0.0.99
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Daniel Draper
@@ -9,50 +14,66 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 +10:30
+date: 2010-07-07 00:00:00 +09:30
 default_executable: nfagent
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: svutil
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 3
         version: 0.0.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 12
+        - 8
         version: 0.12.8
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.2
-    version: 
+        segments: 
+        - 1
+        - 5
+        - 3
+        version: 1.5.3
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
-description: ""
+        segments: 
+        - 2
+        - 4
+        - 0
+        version: 2.4.0
+  type: :development
+  version_requirements: *id004
+description: Logging Agent for NetFox Online
 email: 
 - daniel@netfox.com
 executables: 
@@ -89,7 +110,7 @@ files:
 - nfagent.init.ubuntu.txt
 - nfagent.init.redhat.txt
 has_rdoc: true
-homepage: 
+homepage: http://netfox.com
 licenses: []
 
 post_install_message: PostInstall.txt
@@ -102,18 +123,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: nfagent
-rubygems_version: 1.3.3
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Logging Agent for NetFox Online