nfagent 0.9.28 → 0.9.29

data/lib/nfagent.rb

@@ -36,5 +36,5 @@ require 'nfagent/cli'
 require 'nfagent/tests'
 
 module NFAgent
-  VERSION = '0.9.28'
+  VERSION = '0.9.29'
 end

data/lib/nfagent/chunk_handler.rb

@@ -1,4 +1,7 @@
 module NFAgent
+  class LookUpError < StandardError; end
+  class IgnoreLine < StandardError; end
+
   class ChunkHandler
 
     attr_accessor :chunk_group
@@ -24,9 +27,13 @@ module NFAgent
         parsed = @parser.parse(line)
         return if parsed.invalid?
         if Config.mode == 'multi'
-          key = MapperProxy.find_account_id(parsed.username, parsed.client_ip)
-          # TODO: Still appending line as string until Server API has been updated
-          return append2(line, key)
+          begin
+            key = MapperProxy.find_account_id(parsed.username, parsed.client_ip)
+            # TODO: Still appending line as string until Server API has been updated
+            return append2(line, key)
+          rescue LookUpError, IgnoreLine
+            return # Do nothing
+          end
         end
       end
       # TODO: rename append2

data/test/plugins/my_mapper.rb

@@ -12,6 +12,7 @@ class MyMapper
   end
 
   def find_account_id(username, client_ip)
+    raise NFAgent::IgnoreLine if username == 'andrew'
     @hash[username]
   end
 end

data/test/test_chunk_handler.rb

@@ -9,6 +9,7 @@ class TestChunkHandler < ActiveSupport::TestCase
     NFAgent::Plugin.load_plugins
     @logline = "1253604221  19 127.0.0.1 TCP_MISS/200 562 GET http://www.gravatar.com/blavatar/e81cfb9068d04d1cfd598533bb380e1f?s=16&d=http://s.wordpress.com/favicon.ico dan NONE/- text/html"
     @logline2 = "1253604221  19 127.0.0.1 TCP_MISS/200 562 GET http://www.gravatar.com/blavatar/e81cfb9068d04d1cfd598533bb380e1f?s=16&d=http://s.wordpress.com/favicon.ico paul NONE/- text/html"
+    @ignored_logline = "1253604221  19 127.0.0.1 TCP_MISS/200 562 GET http://www.gravatar.com/blavatar/e81cfb9068d04d1cfd598533bb380e1f?s=16&d=http://s.wordpress.com/favicon.ico andrew NONE/- text/html"
   end
 
   test "append line" do
@@ -41,6 +42,18 @@ class TestChunkHandler < ActiveSupport::TestCase
     assert_equal 1, chunk_handler.chunk_group['jetson'].size
   end
 
+  test "mapper raises ignore line in multi mode" do
+    NFAgent::Config.parse = 'locally'
+    NFAgent::Config.mode = 'multi'
+    NFAgent::Config.mapper = 'MyMapper'
+    chunk_handler = NFAgent::ChunkHandler.new
+    chunk_handler.append(@ignored_logline)
+    assert !chunk_handler.chunk_group.has_key?('acme')
+    assert !chunk_handler.chunk_group.has_key?('jetson')
+    assert chunk_handler.chunk_group['acme'].blank?
+    assert chunk_handler.chunk_group['jetson'].blank?
+  end
+
   test "reset chunk after expiry in multi mode" do
     NFAgent::Config.parse = 'locally'
     NFAgent::Config.mode = 'multi'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 28
-  version: 0.9.28
+  - 29
+  version: 0.9.29
 platform: ruby
 authors: 
 - Daniel Draper
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +10:30
+date: 2011-02-10 00:00:00 +10:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency