mq_logger 0.0.3 → 0.0.4

data/Gemfile

@@ -1,8 +1,9 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in logstash-logger.gemspec
+# Specify your gem's dependencies in mq_logger.gemspec
 gemspec
 
 gem 'json', :platform => :ruby_18
 gem 'amqp'
 gem 'amq-client', '>= 0.9.10'
+

data/README.md

@@ -1,9 +1,6 @@
 # MqLogger
 
-It is a logger, which write log to rabbitmq.
-
-#Requirements
-1. Ensure you have a amqp connection before logging.
+TODO: Write a gem description
 
 ## Installation
 

data/lib/mq_logger.rb

@@ -1,8 +1,117 @@
+require 'mq_logger/version'
+
 require 'thread'
 require 'socket'
-require 'logstash-event'
-require 'amqp'
 
-require 'mq_logger/mq_client'
-require 'mq_logger/logger'
-require 'mq_logger/version'
+module MqLogger
+  class MQClient
+    def initialize(queue_nqme, routing_key)
+      @queue = queue_nqme
+      @route = routing_key
+      @channel = nil
+    end
+  
+    def write(event)
+      begin
+        connect unless @channel
+      
+        @channel.direct(@queue, :durable => true, :persistent => true).publish("#{event.to_hash.to_json}\n", :routing_key => @route)
+      rescue => e
+        warn "MQClient - #{e.class} - #{e.message}, AMQP.channel is null; log===#{event.to_hash.to_json.inspect}"
+      end
+    end
+  
+    # def close
+    #   @socket && @socket.close
+    # rescue => e
+    #   warn "LogStashLogger::TCPClient - #{e.class} - #{e.message}"
+    # end
+  
+    private
+    def connect
+      @channel = AMQP.channel
+    end
+  end
+
+  class RabbitLogger < ::Logger
+    module Level
+      DEBUG = 0
+      INFO = 1
+      WARN = 2
+      ERROR = 3
+      FATAL = 4
+      UNKNOWN = 5
+    end
+  
+    attr_reader :client
+  
+    LOGSTASH_EVENT_FIELDS = %w(@timestamp @tags @type @source @source_host @fields @message).freeze
+    HOST = Socket.gethostname
+  
+    def initialize(queue, route, source=nil)
+      @client = ::MqLogger::MQClient.new(queue, route)
+      @source = source
+      super
+    end
+  
+    def add(severity, message = nil, progname = nil, &block)
+      severity ||= UNKNOWN
+      if severity < @level
+        return true
+      end
+      progname ||= @progname
+      if message.nil?
+        if block_given?
+          message = yield
+        else
+          message = progname
+          progname = @progname
+        end
+      end
+      @client.write(
+        format_message(format_severity(severity), Time.now, progname, message))
+      true
+    end
+  
+    def format_message(severity, time, progname, message)
+      data = message
+      if data.is_a?(String) && data[0] == '{'
+        data = (JSON.parse(message) rescue nil) || message
+      end
+    
+      event = case data
+      when LogStash::Event
+        data.clone
+      when Hash
+        event_data = {
+          "@tags" => [],
+          "@fields" => {},
+          "@timestamp" => time
+        }
+        LOGSTASH_EVENT_FIELDS.each do |field_name|
+          if field_data = data.delete(field_name)
+            event_data[field_name] = field_data
+          end
+        end
+        event_data["@fields"].merge!(data)
+        event_data["@timestamp"] = time
+        LogStash::Event.new(event_data)
+      when String
+        LogStash::Event.new("@message" => data, "@timestamp" => time)
+      end
+    
+      event['severity'] ||= severity
+      #event.type = progname
+      if event.source == 'unknown'
+        event.source = @source
+      elsif !event.source
+        event.source = HOST
+      end
+    
+      if !event.source_host
+        event.source_host = HOST
+      end
+      event
+    end
+  end
+end

data/lib/mq_logger/version.rb

@@ -1,4 +1,5 @@
-require 'logger'
-class MqLogger < ::Logger
-  VERSION = "0.0.3"
+module MqLogger
+  
+  VERSION = "0.0.4"
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mq_logger
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies: []
 description: for rails log to rabbitmq
 email: