gentle reconnection

Gemfile

@@ -1,3 +1,3 @@
 source :gemcutter
-
+gem 'bunny', :git => "git://github.com/ruby-amqp/bunny.git", :branch => "master"
 gemspec

lib/log4r.rb

@@ -9,6 +9,7 @@
 require "log4r/outputter/fileoutputter"
 require "log4r/outputter/consoleoutputters"
 require "log4r/outputter/staticoutputter"
+require "log4r/outputter/rabbitoutputter"
 require "log4r/outputter/rollingfileoutputter"
 require "log4r/formatter/patternformatter"
 require "log4r/loggerfactory"

lib/log4r/formatter/formatter.rb

@@ -3,7 +3,7 @@
 # Version:: $Id$
 
 require "singleton"
-
+require 'json'
 require "log4r/base"
 
 module Log4r
@@ -68,13 +68,17 @@ def format(event)
     #              +inspect+. An example -- Array: [1, 2, 3]
 
     def format_object(obj)
-      if obj.kind_of? Exception
+      klass = obj.class
+      case  
+        when klass == Exception
         return "Caught #{obj.class}: #{obj.message}\n\t" +\
-               (obj.backtrace.nil? ? [] : obj.backtrace[0...@depth]).join("\n\t")
-      elsif obj.kind_of? String
-        return obj
-      else # inspect the object
-        return "#{obj.class}: #{obj.inspect}"
+          (obj.backtrace.nil? ? [] : obj.backtrace[0...@depth]).join("\n\t").gsub('"','\\\\"')
+        when klass == Hash
+          return obj.to_json.gsub('"','\\\\"')
+        when klass == String
+          return obj.gsub('"','\\\\"')
+        else # inspect the object
+          return "#{obj.class}: #{obj.inspect}".gsub('"','\\\\"')
       end
     end
   end

lib/log4r/outputter/rabbitoutputter.rb

@@ -0,0 +1,85 @@
+# :nodoc:
+require "rubygems"
+require 'logger'
+require "log4r/outputter/outputter"
+require 'bunny'
+require 'yaml'
+require 'stringio'
+
+module Log4r
+  # See log4r/logserver.rb
+  class RabbitOutputter < Outputter
+
+    def initialize(_name, hash={})
+      # Configuration defaults
+      super(_name, hash)
+      stderr_log "Unable to find rabbit configuration file" unless load_config
+      @config ||= {:host => "localhost"}
+      @config.symbolize_keys!
+      @queue_name = @config.delete(:queue) || ''
+      init_buffer
+      start_bunny rescue nil
+    end
+
+    def load_config_file(name)
+      path = "#{Rails.root}/config/#{name}"
+      if File.exist?(path)
+        @config = YAML::load(IO.read(path))
+      end
+    end
+
+    def load_config
+      @config = if load_config_file("bunny.yml")
+        @config[Rails.env]
+      else
+        load_config_file("rabbitmq.yml")
+      end
+    end
+
+    def start_bunny
+      begin
+        stderr_log "Starting Bunny Client"
+        config = @config.clone
+        config[:pass] &&= "**redacted**"
+        stderr_log config
+        @conn = Bunny.new @config
+        @conn.start
+        create_channel
+      rescue Bunny::TCPConnectionFailed => e
+        stderr_log "rescued from: #{e}. Unable to connect to Rabbit Server"
+      end
+    end
+
+    def stderr_log(msg)
+      $stderr.puts "[#{Time.now.utc}] #{msg}"
+    end
+
+    def create_channel
+      ch = @conn.create_channel
+      @queue  = ch.queue(@queue_name, auto_delete: false, durable: true)
+    end
+
+    def flush
+      @queue.publish(read_buffer, { routing_key: @queue.name }) if @conn.connected? and @queue
+      init_buffer
+    rescue Exception => e
+      @conn.send(:handle_network_failure, e)
+      create_channel if @conn.connected?
+    end
+
+    private
+
+    def init_buffer
+      @buffered_data = []
+    end
+
+    def write(data)
+      @buffered_data << data.gsub(/\s+$/,'')
+    end
+
+    def read_buffer
+      @buffered_data.join("\n")
+    end
+
+  end
+end

lib/log4r/version.rb

@@ -1,4 +1,4 @@
 module Log4r
-  Log4rVersion = [1, 1, 10].join '.' # deprecate?
+  Log4rVersion = [1, 1, 11].join '.' # deprecate?
   VERSION = Log4rVersion
 end