nfagent 0.9.11 → 0.9.13

data/lib/nfagent.rb

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

data/lib/nfagent/chunk.rb

@@ -30,6 +30,8 @@ module NFAgent
     def dump
       Payload.new do |payload|
         Log.info("Dumping payload from chunk (#{@array.size} lines)")
+        payload.line_count = @array.size
+        payload.chunk_expired = expired?
         payload.data = Encoder.encode64url(Zlib::Deflate.deflate(@array.join("\n"), Zlib::BEST_COMPRESSION))
         payload.checksum = Digest::SHA1.hexdigest(payload.data)
       end

data/lib/nfagent/payload.rb

@@ -1,12 +1,12 @@
 
 module NFAgent
-  class Payload < Struct.new(:data, :checksum, :filename)
+  class Payload < Struct.new(:data, :checksum, :filename, :line_count, :chunk_expired)
     def initialize
       yield self
     end
 
     def attempt
-      @attempt || 1
+      @attempt || 0
     end
 
     def attempt=(value)
@@ -22,6 +22,15 @@ module NFAgent
       (self.data || "").size + 1
     end
 
+    def to_hash
+      {
+        "payload" => self.data,
+        "checksum" => self.checksum,
+        "line_count" => self.line_count,
+        "chunk_expired" => self.chunk_expired
+      }
+    end
+
     def write_to_disk(directory)
       File.open(File.join(directory, "#{self.checksum}-#{self.attempt}"), "w") do |file|
         file << self.data

data/lib/nfagent/submitter.rb

@@ -10,9 +10,9 @@ module NFAgent
     def perform
       @payload.increment_attempt!
       fail(@payload) unless [ 1, 2, 4, 8, 16 ].include?(@payload.attempt)
-      Log.info "Submitting Payload: #{@payload.checksum}, Attempt #{@payload.attempt}, (#{@payload.size} bytes)"
+      Log.info "Submitting Payload: #{@payload.checksum}, Attempt #{@payload.attempt}, (#{@payload.size} bytes, #{@payload.line_count} lines)"
       @payload.lock do
-        response = Client.post(:collector, "payload" => @payload.data, "checksum" => @payload.checksum)
+        response = Client.post(:collector, @payload.to_hash)
         if response.ok?
           succeed(@payload)
         else

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 11
-  version: 0.9.11
+  - 13
+  version: 0.9.13
 platform: ruby
 authors: 
 - Daniel Draper