logjam_agent 0.19.4 → 0.19.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bffe54ae7a2f79b516804c95ecf2a2272d3b1b7
-  data.tar.gz: 280a394d54ecf5d7fcb84dd78c15222746b77d2a
+  metadata.gz: 0279d90588ebec498f742e91649a69419e8d64cb
+  data.tar.gz: bd5268ff93c0f8d61f5bab144d815da2438c3432
 SHA512:
-  metadata.gz: 00581356bef24ce775b29f9a201f2635909fb0fd36f73c9f0db2a741d40b3224d8557c2a7d57c17f964e4cffd2c213d78fa2c3a484fccdc4a5650cab6988362b
-  data.tar.gz: be04344959f08f5ee808e12f0c8450984e2d02f7ffddef88ba62c65f8c1b38fa63d74aa2b9fcd73e1cb3fcffd08de3212daebc64a81266392d7b270bb2efcab6
+  metadata.gz: 32b4a9a97156a850fba99f585b53fec62b0aec9b1bf397e4cb3ceb419252886811eee5351a773b5f2b5ae8ecf9cd6ca39dc13a9f759500f2ecdb821b817615e0
+  data.tar.gz: ee8df18ee840b4d1dd79dc82ddf175eb3aae3cbb83886ee1d83b45cf5bfc9490d9c9186b9c01e7cc576ac75c1f78e5eaea9928eda0dedd9b98afb759706120cf

data/lib/logjam_agent/amqp_forwarder.rb

@@ -28,36 +28,38 @@ module LogjamAgent
     end
 
     # TODO: mutex!
-    def forward(msg, options = {})
+    def forward(data, options = {})
       return if paused?
-      begin
-        app_env = options[:app_env] || @app_env
-        key = options[:routing_key] || "logs.#{app_env.sub('-','.')}"
-        if engine = options[:engine]
-          key += ".#{engine}"
-        end
-        info = pack_info(@sequence = next_fixnum(@sequence))
-        exchange(app_env).publish(msg, :key => key, :persistent => false, :headers => {:info => info})
-      rescue => error
-        reraise_expectation_errors!
-        pause(error)
+      app_env = options[:app_env] || @app_env
+      key = options[:routing_key] || "logs.#{app_env.sub('-','.')}"
+      if engine = options[:engine]
+        key += ".#{engine}"
       end
+      msg = LogjamAgent.encode_payload(data)
+      publish(app_env, key, msg)
+    rescue => error
+      reraise_expectation_errors!
+      pause(error)
+    end
+
+    def publish(app_env, key, data)
+      info = pack_info(@sequence = next_fixnum(@sequence))
+      exchange(app_env).publish(data, :key => key, :persistent => false, :headers => {:info => info})
     end
 
     def reset(exception=nil)
       return unless @bunny
-      begin
-        if exception
-          @bunny.__send__(:close_socket)
-        else
-          @bunny.stop
-        end
-      rescue
-        # if bunny throws an exception here, its not usable anymore anyway
-      ensure
-        @exchanges = {}
-        @bunny = nil
+      if exception
+        @bunny.__send__(:close_socket)
+      else
+        @bunny.stop
       end
+    rescue
+      # swallow StandardError
+    ensure
+      # if bunny throws an exception here, its not usable anymore anyway
+      @exchanges = {}
+      @bunny = nil
     end
 
     private

data/lib/logjam_agent/request.rb

@@ -84,8 +84,7 @@ module LogjamAgent
     def forward
       return if @ignored || LogjamAgent.disabled
       engine = @fields.delete(:engine)
-      # puts @fields.inspect
-      @forwarder.forward(LogjamAgent.encode_payload(@fields), :engine => engine)
+      @forwarder.forward(@fields, :engine => engine)
     rescue Exception => e
       handle_forwarding_error(e)
     end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.19.4"
+  VERSION = "0.19.5"
 end

data/lib/logjam_agent/zmq_forwarder.rb

@@ -20,7 +20,7 @@ module LogjamAgent
     def default_options
       {
         :port         => 9605,
-        :linger       => 100,
+        :linger       => 1000,
         :snd_hwm      => 100,
       }
     end
@@ -58,12 +58,13 @@ module LogjamAgent
       @socket = nil
     end
 
-    def forward(msg, options={})
+    def forward(data, options={})
       app_env = options[:app_env] || @app_env
       key = options[:routing_key] || "logs.#{app_env.sub('-','.')}"
       if engine = options[:engine]
         key += ".#{engine}"
       end
+      msg = LogjamAgent.encode_payload(data)
       publish(app_env, key, msg)
     rescue => error
       reraise_expectation_errors!

data/logjam_agent.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "oj"
   s.add_development_dependency "byebug"
   s.add_development_dependency "minitest"
+  s.add_development_dependency "mocha"
 
   s.add_runtime_dependency "activesupport"
   s.add_runtime_dependency "time_bandits", [">= 0.6.0"]

data/test/amqp_forwarder_test.rb

@@ -0,0 +1,32 @@
+require_relative "test_helper.rb"
+
+module LogjamAgent
+  class AMQPForwarderTest < MiniTest::Test
+    def setup
+      AMQPForwarder.any_instance.expects(:ensure_bunny_gem_is_available)
+    end
+
+    def teardown
+      LogjamAgent.compression_method = NO_COMPRESSION
+    end
+
+    test "encodes the payload" do
+      data = {a: 1, b: "str"}
+      msg = LogjamAgent.encode_payload(data)
+      f = AMQPForwarder.new
+      f.expects(:publish).with("a-b", "x", msg)
+      f.forward(data, :routing_key => "x", :app_env => "a-b")
+    end
+
+    test "compressed message using snappy can be uncompressed" do
+      data = {a: 1, b: "str"}
+      normal_msg = LogjamAgent.encode_payload(data)
+      LogjamAgent.compression_method = SNAPPY_COMPRESSION
+      compressed_msg = LogjamAgent.encode_payload(data)
+      assert_equal normal_msg, Snappy.inflate(compressed_msg)
+      f = AMQPForwarder.new
+      f.expects(:publish).with("a-b", "x", compressed_msg)
+      f.forward(data, :routing_key => "x", :app_env => "a-b")
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require 'minitest/unit'
 require 'minitest/pride' if ENV['RAINBOW_COLORED_TESTS'] == "1" && $stdout.tty?
-# require 'mocha/setup'
+require 'mocha/setup'
 
 require_relative "../lib/logjam_agent"
 

data/test/zmq_forwarder_test.rb

@@ -3,6 +3,10 @@ require_relative "test_helper.rb"
 module LogjamAgent
   class ZMQForwarderTest < MiniTest::Test
 
+    def teardown
+      LogjamAgent.compression_method = NO_COMPRESSION
+    end
+
     test "sets up single connection with default port" do
       f = ZMQForwarder.new(:host => "a.b.c", :port => 3001)
       assert_equal ["tcp://a.b.c:3001"], f.connection_specs
@@ -13,5 +17,24 @@ module LogjamAgent
       assert_equal %w(tcp://a.b.c:9605 tcp://x.y.z:9000 tcp://zmq.gnu.org:600), f.connection_specs
     end
 
+    test "encodes the payload" do
+      data = {a: 1, b: "str"}
+      msg = LogjamAgent.encode_payload(data)
+      f = ZMQForwarder.new
+      f.expects(:publish).with("a-b", "x", msg)
+      f.forward(data, :routing_key => "x", :app_env => "a-b")
+    end
+
+    test "compressed message using snappy can be uncompressed" do
+      data = {a: 1, b: "str"}
+      normal_msg = LogjamAgent.encode_payload(data)
+      LogjamAgent.compression_method = SNAPPY_COMPRESSION
+      compressed_msg = LogjamAgent.encode_payload(data)
+      assert_equal normal_msg, Snappy.inflate(compressed_msg)
+      f = ZMQForwarder.new
+      f.expects(:publish).with("a-b", "x", compressed_msg)
+      f.forward(data, :routing_key => "x", :app_env => "a-b")
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.19.4
+  version: 0.19.5
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +162,7 @@ files:
 - lib/logjam_agent/zmq_forwarder.rb
 - logjam_agent.gemspec
 - script/console
+- test/amqp_forwarder_test.rb
 - test/test_helper.rb
 - test/util_test.rb
 - test/zmq_forwarder_test.rb
@@ -175,6 +190,7 @@ signing_key:
 specification_version: 4
 summary: Logjam client library to be used with logjam
 test_files:
+- test/amqp_forwarder_test.rb
 - test/test_helper.rb
 - test/util_test.rb
 - test/zmq_forwarder_test.rb