logjam_agent 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76e4acbd92955208e5de2dc2dca507706680e2ea
-  data.tar.gz: 111c2506ca03dd76ac3845a4bfe6d5ce04b05dec
+  metadata.gz: 3e9d6b9f04d490d4972525d48260a3615ac025f7
+  data.tar.gz: 57eb3ff05b85e938cbc311bb3129f04ac917e2c8
 SHA512:
-  metadata.gz: f168cb6d857520094b22413139410596bbe55eb15288059f77c99765fbc2a82a10a1b3f09976d86f3900449113dabb8b23f9aa4f523fde8efd1ea5fc5c2121db
-  data.tar.gz: e64fa86a63bfa0a13bdc114447d373e3f0874d9bd1268b217958f707fd4011869eb455285b73dc4889ca032d384954b036262a818c892aacddedc68853ac7266
+  metadata.gz: 171dbc3e7dcee9784ad8ce9a24b2bc09c879f96c5e7703dc415ea5be771a5ea88afdcee5098ed323331a8d15028f7287a428983cb3e610f1ba873b31bc1dec11
+  data.tar.gz: 379fb53d4e360366f5b9e43994c0519b76b680db11099eebdfa9bd208d200316f32167b9741fa5bf83cadf3af48cc33740612f99b1ba412f293521004359e0a8

data/README.md

@@ -38,8 +38,14 @@ module LogjamAgent
   # Configure the application revision (optional). Defaults to (git rev-parse HEAD).
   # self.application_revision = "f494e11afa0738b279517a2a96101a952052da5d"
 
-  # Configure request data forwarder for ZeroMQ.
-  add_forwarder(:zmq, :host => "logjam.instance.at.your.org", :port => 9605)
+  # Configure request data forwarder for ZeroMQ. Default options as given below.
+  # the host parameter can be a comma separted list of zmq connection specifictions,
+  # where ths protocol prefix and port suffix are optional.
+  add_forwarder(:zmq,
+                :host    => "localhost",
+                :port    => 9605,
+                :linger  => 100,
+                :snd_hwm => 100)
 
   # Configure request data forwarder for AMQP.
   # add_forwarder(:amqp, :host => "message.broker.at.your.org")

data/Rakefile

@@ -1 +1,14 @@
-require "bundler/gem_tasks"
+require 'bundler/setup'
+require 'rake'
+require 'rake/testtask'
+require 'bundler/gem_tasks'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+end
+
+task :default do
+  Rake::Task[:test].invoke
+end

data/lib/logjam_agent/util.rb

@@ -57,5 +57,12 @@ module LogjamAgent
       sequence = unpack_uint64_big_endian(info[16..23])
       [tag, compression_method, version, device, sent, sequence]
     end
+
+    def augment_connection_spec(spec, default_port)
+      protocol, host, port = %r{\A(?:([^:]+)://)?([^:]+)(?::(\d+))?\z}.match(spec).captures
+      protocol ||= "tcp"
+      port ||= default_port
+      "#{protocol}://#{host}:#{port}"
+    end
   end
 end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.19.1"
+  VERSION = "0.19.2"
 end

data/lib/logjam_agent/zmq_forwarder.rb

@@ -1,6 +1,6 @@
 module LogjamAgent
   class ZMQForwarder
-    attr_reader :app, :env
+    attr_reader :app, :env, :connection_specs
 
     include Util
 
@@ -10,15 +10,18 @@ module LogjamAgent
       @env = args[1] || LogjamAgent.environment_name
       @app_env = "#{@app}-#{@env}"
       @config = default_options.merge!(opts)
-      @zmq_hosts = Array(@config[:host])
-      @zmq_port = @config[:port]
+      @connection_specs = @config[:host].split(',').map do |host|
+        augment_connection_spec(host, @config[:port])
+      end
       @sequence = 0
     end
 
     def default_options
       {
         :host         => "localhost",
-        :port         => 12345
+        :port         => 9605,
+        :linger       => 100,
+        :snd_hwm      => 100,
       }
     end
 
@@ -41,10 +44,10 @@ module LogjamAgent
       @socket ||=
         begin
           socket = self.class.context.socket(ZMQ::PUSH)
-          socket.setsockopt(ZMQ::LINGER, 100)
-          socket.setsockopt(ZMQ::SNDHWM, 10)
-          @zmq_hosts.each do |host|
-            socket.connect("tcp://#{host}:#{@zmq_port}")
+          socket.setsockopt(ZMQ::LINGER, @config[:linger])
+          socket.setsockopt(ZMQ::SNDHWM, @config[:snd_hwm])
+          @connection_specs.each do |spec|
+            socket.connect(spec)
           end
           at_exit { reset }
           socket

data/logjam_agent.gemspec

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

data/test/test_helper.rb

@@ -0,0 +1,11 @@
+require 'minitest/autorun'
+require 'minitest/unit'
+require 'minitest/pride' if ENV['RAINBOW_COLORED_TESTS'] == "1" && $stdout.tty?
+# require 'mocha/setup'
+
+require_relative "../lib/logjam_agent"
+
+class MiniTest::Test
+  require "active_support/testing/declarative"
+  extend ActiveSupport::Testing::Declarative
+end

data/test/util_test.rb

@@ -0,0 +1,28 @@
+require_relative "test_helper.rb"
+
+module LogjamAgent
+  class UtilTest < MiniTest::Test
+    include LogjamAgent::Util
+
+    test "does not change a full spec" do
+      augmented = augment_connection_spec("tcp://a:1", 2)
+      assert_equal "tcp://a:1", augmented
+    end
+
+    test "adds default port when missing" do
+      augmented = augment_connection_spec("tcp://a", 1)
+      assert_equal "tcp://a:1", augmented
+    end
+
+    test "adds default protocol when missing" do
+      augmented = augment_connection_spec("a:1", 2)
+      assert_equal "tcp://a:1", augmented
+    end
+
+    test "adds default protocol and default port when missing" do
+      augmented = augment_connection_spec("a", 1)
+      assert_equal "tcp://a:1", augmented
+    end
+
+  end
+end

data/test/zmq_forwarder_test.rb

@@ -0,0 +1,17 @@
+require_relative "test_helper.rb"
+
+module LogjamAgent
+  class ZMQForwarderTest < MiniTest::Test
+
+    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
+    end
+
+    test "sets up multiple connections" do
+      f = ZMQForwarder.new(:host => "a.b.c,tcp://x.y.z:9000,zmq.gnu.org:600")
+      assert_equal %w(tcp://a.b.c:9605 tcp://x.y.z:9000 tcp://zmq.gnu.org:600), f.connection_specs
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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
@@ -134,6 +148,9 @@ files:
 - lib/logjam_agent/zmq_forwarder.rb
 - logjam_agent.gemspec
 - script/console
+- test/test_helper.rb
+- test/util_test.rb
+- test/zmq_forwarder_test.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -157,4 +174,7 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Logjam client library to be used with logjam
-test_files: []
+test_files:
+- test/test_helper.rb
+- test/util_test.rb
+- test/zmq_forwarder_test.rb