logjam_agent 0.6.1 → 0.6.2

data/lib/logjam_agent.rb

@@ -4,6 +4,7 @@ require "time_bandits"
 
 require "logjam_agent/version"
 require "logjam_agent/amqp_forwarder"
+require "logjam_agent/zmq_forwarder"
 require "logjam_agent/forwarders"
 require "logjam_agent/request"
 require "logjam_agent/buffered_logger"

data/lib/logjam_agent/buffered_logger.rb

@@ -77,7 +77,7 @@ module LogjamAgent
     end
 
     def format_exception(exception)
-      msg = "#{exception.class} (#{exception.message})"
+      msg = "#{exception.class}(#{exception.message})"
       if backtrace = exception.backtrace
         backtrace = Rails.backtrace_cleaner.clean(backtrace, :all) if defined?(Rails)
         msg << ":\n  #{backtrace.join("\n  ")}"

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/lib/logjam_agent/zmq_forwarder.rb

@@ -0,0 +1,91 @@
+module LogjamAgent
+  class ZMQForwarder
+    attr_reader :app, :env
+
+    def initialize(app, env, opts = {})
+      @app = app
+      @env = env
+      @config = default_options(app, env).merge!(opts)
+      @exchange = @config[:exchange]
+      @zmq_hosts = Array(@config[:host])
+      @zmq_port = @config[:port]
+    end
+
+    def default_options(app, env)
+      {
+        :host         => "localhost",
+        :exchange     => "request-stream-#{app}-#{env}",
+        :routing_key  => "logs.#{app}.#{env}",
+        :port         => 12345
+      }
+    end
+
+    @@mutex = Mutex.new
+    @@zmq_context = nil
+
+    def self.context
+      @@mutex.synchronize do
+        @@zmq_context ||=
+          begin
+            require 'ffi-rzmq'
+            context = ZMQ::Context.new(1)
+            at_exit { context.terminate }
+            context
+          end
+      end
+    end
+
+    def socket
+      @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}")
+          end
+          at_exit { reset }
+          socket
+        end
+    end
+
+    def reset
+      return unless @socket
+      # $stderr.puts "closing socket"
+      @socket.close
+      @socket = nil
+    end
+
+    def forward(msg, engine)
+      return if LogjamAgent.disabled
+      begin
+        key = @config[:routing_key]
+        key += ".#{engine}" if engine
+        publish(key, msg)
+      rescue Exception => exception
+        reraise_expectation_errors!
+        raise ForwardingError.new(exception.message)
+      end
+    end
+
+    def publish(key, data)
+      parts = [@exchange, key, data]
+      if socket.send_strings(parts, ZMQ::NonBlocking) < 0
+        raise "ZMQ error: #{ZMQ::Util.error_string}"
+      end
+    end
+
+    private
+
+    if defined?(Mocha)
+      def reraise_expectation_errors! #:nodoc:
+        raise if $!.is_a?(Mocha::ExpectationError)
+      end
+    else
+      def reraise_expectation_errors! #:nodoc:
+        # noop
+      end
+    end
+
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logjam_agent
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-02 00:00:00 Z
+date: 2013-01-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -113,6 +113,7 @@ files:
 - lib/logjam_agent/request.rb
 - lib/logjam_agent/syslog_like_formatter.rb
 - lib/logjam_agent/version.rb
+- lib/logjam_agent/zmq_forwarder.rb
 - logjam_agent.gemspec
 - rails/init.rb
 homepage: ""