semantic_logger 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16e4711a6003653a8d7cf1668fe3180e10493e43
-  data.tar.gz: c0266b7ebb30904275543fc083e553260bead056
+  metadata.gz: 50213eafcd6560b8240844cfb686a2a954537091
+  data.tar.gz: d6df1d6905b315ccef4915cf59b819e62d2697bf
 SHA512:
-  metadata.gz: cdbf75bce867ba9fae2a524447d62f65093fc6ada2cb2214b67f599b5ee77b3d997ffb29e3e6db34efb09fdab24b8cc662700b664a58835aa1d88763f4d893b7
-  data.tar.gz: 3eff413a5f6a09af3f4aa84b7eaf717bd10cedff41d49202d0882442ba53e3519aff4b88c37a06bcc5703e9b744c2dbbc6f5533948c24cfd03fd9bc90905412e
+  metadata.gz: 048295e8e5a07f91ffe44a2108cb12135fbcfb25d604ad3ec0656e41cc0435689dc215de8bd0c994b81ec1fcf4e850e46d7733c7e2a5676e3b2e92ecc42971e5
+  data.tar.gz: ce6f018889578dc8a44855e2bfc528d939cf5b8c0bd4872c41f55b5e1537adb8e99cd231c86e4829164bea1a5f1c2b728c2df52c566d79d73bcbf7bf578370b5

data/lib/semantic_logger/appender/base.rb

@@ -1,3 +1,4 @@
+require 'json'
 # Load AwesomePrint if available
 begin
   require 'awesome_print'

data/lib/semantic_logger/appender/elasticsearch.rb

@@ -18,8 +18,10 @@ class SemanticLogger::Appender::Elasticsearch < SemanticLogger::Appender::Http
   #
   # Parameters:
   #   index: [String]
-  #     Index to store the logs in Elasticsearch.
-  #     Default: 'semantic_logger-YYYY.MM.DD'
+  #     Prefix of the index to store the logs in Elasticsearch.
+  #     The final index appends the date so that indexes are used per day.
+  #       I.e. The final index will look like 'semantic_logger-YYYY.MM.DD'
+  #     Default: 'semantic_logger'
   #
   #   type: [String]
   #     Document type to associate with logs when they are written.
@@ -36,18 +38,24 @@ class SemanticLogger::Appender::Elasticsearch < SemanticLogger::Appender::Http
   #           The Proc must return true or false.
   def initialize(options, &block)
     options       = options.dup
-    @index        = options.delete(:index) || "semantic_logger-#{Date.today.to_s.gsub('-', '.')}"
+    @index        = options.delete(:index) || "semantic_logger"
     @type         = options.delete(:type) || 'log'
     options[:url] ||= 'http://localhost:9200'
 
     super(options, &block)
+  end
+
+  # Log to the index for today
+  def log(log)
+    return false if (level_index > (log.level_index || 0)) ||
+      !include_message?(log) # Filtered out?
 
-    @request_uri = "#{@index}/#{@type}"
+    post(formatter.call(log, self), "#{index}-#{log.time.strftime('%Y.%m.%d')}/#{type}")
   end
 
-  # Deletes all log data captured for this index
-  def delete_all
-    delete(index)
+  # Deletes all log data captured for a day
+  def delete_all(date = Date.today)
+    "#{index}-#{date.strftime('%Y.%m.%d')}/#{type}"
   end
 
 end

data/lib/semantic_logger/appender/http.rb

@@ -21,7 +21,7 @@ require 'json'
 #   SemanticLogger.add_appender(appender)
 class SemanticLogger::Appender::Http < SemanticLogger::Appender::Base
   attr_accessor :username, :application, :host, :compress, :header
-  attr_reader :http, :url, :server, :port, :request_uri, :ssl_options
+  attr_reader :http, :url, :server, :port, :path, :ssl_options
 
   # Create HTTP(S) log appender
   #
@@ -90,11 +90,13 @@ class SemanticLogger::Appender::Http < SemanticLogger::Appender::Base
     uri                             = URI.parse(@url)
     (@ssl_options ||= {})[:use_ssl] = true if uri.scheme == 'https'
 
-    @server      = uri.host
-    @port        = uri.port
-    @username    = uri.user if !@username && uri.user
-    @password    = uri.password if !@password && uri.password
-    @request_uri = uri.request_uri
+    @server = uri.host
+    raise(ArgumentError, "Invalid format for :url: #{@url.inspect}. Should be similar to: 'http://hostname:port/path'") unless @url
+
+    @port     = uri.port
+    @username = uri.user if !@username && uri.user
+    @password = uri.password if !@password && uri.password
+    @path     = uri.request_uri
 
     reopen
 
@@ -132,20 +134,20 @@ class SemanticLogger::Appender::Http < SemanticLogger::Appender::Base
   end
 
   # HTTP Post
-  def post(body, request_uri = nil)
-    request = Net::HTTP::Post.new(request_uri || @request_uri, @header)
+  def post(body, request_uri = path)
+    request = Net::HTTP::Post.new(request_uri, @header)
     process_request(request, body)
   end
 
   # HTTP Put
-  def put(body, request_uri = nil)
-    request = Net::HTTP::Put.new(request_uri || @request_uri, @header)
+  def put(body, request_uri = path)
+    request = Net::HTTP::Put.new(request_uri, @header)
     process_request(request, body)
   end
 
   # HTTP Delete
-  def delete(request_uri = nil)
-    request = Net::HTTP::Delete.new(request_uri || @request_uri, @header)
+  def delete(request_uri = path)
+    request = Net::HTTP::Delete.new(request_uri, @header)
     process_request(request)
   end
 

data/lib/semantic_logger/appender/splunk_http.rb

@@ -1,3 +1,4 @@
+require 'json'
 # Splunk log appender.
 #
 # Use the newer, faster and more complete JSON over HTTP interface for Splunk.

data/lib/semantic_logger/version.rb

@@ -1,3 +1,3 @@
 module SemanticLogger #:nodoc
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/test/appender/elasticsearch_test.rb

@@ -0,0 +1,72 @@
+require_relative '../test_helper'
+
+# Unit Test for SemanticLogger::Appender::Elasticsearch
+module Appender
+  class ElasticsearchTest < Minitest::Test
+    response_mock = Struct.new(:code, :body)
+
+    describe SemanticLogger::Appender::Elasticsearch do
+      before do
+        @appender = SemanticLogger::Appender::Elasticsearch.new(
+          url: 'http://localhost:9200'
+        )
+        @message  = 'AppenderElasticsearchTest log message'
+      end
+
+      it 'logs to daily indexes' do
+        index = nil
+        @appender.stub(:post, -> json, ind { index = ind }) do
+          @appender.info @message
+        end
+        assert_equal "semantic_logger-#{Time.now.utc.strftime('%Y.%m.%d')}/log", index
+      end
+
+      SemanticLogger::LEVELS.each do |level|
+        it "send #{level}" do
+          request = nil
+          @appender.http.stub(:request, -> r { request = r; response_mock.new('200', 'ok') }) do
+            @appender.send(level, @message)
+          end
+          message = JSON.parse(request.body)
+          assert_equal @message, message['message']
+          assert_equal level.to_s, message['level']
+          refute message['exception']
+        end
+
+        it "sends #{level} exceptions" do
+          exc = nil
+          begin
+            Uh oh
+          rescue Exception => e
+            exc = e
+          end
+          request = nil
+          @appender.http.stub(:request, -> r { request = r; response_mock.new('200', 'ok') }) do
+            @appender.send(level, 'Reading File', exc)
+          end
+          hash = JSON.parse(request.body)
+          assert 'Reading File', hash['message']
+          assert exception = hash['exception']
+          assert 'NameError', exception['name']
+          assert 'undefined local variable or method', exception['message']
+          assert_equal level.to_s, hash['level']
+          assert exception['stack_trace'].first.include?(__FILE__), exception
+        end
+
+        it "sends #{level} custom attributes" do
+          request = nil
+          @appender.http.stub(:request, -> r { request = r; response_mock.new('200', 'ok') }) do
+            @appender.send(level, @message, {key1: 1, key2: 'a'})
+          end
+          message = JSON.parse(request.body)
+          assert_equal @message, message['message']
+          assert_equal level.to_s, message['level']
+          refute message['stack_trace']
+          assert_equal(1, message['key1'], message)
+          assert_equal('a', message['key2'], message)
+        end
+      end
+
+    end
+  end
+end

data/test/appender/splunk_http_test.rb

@@ -40,9 +40,6 @@ module Appender
           end
           body = decompress_data(request.body)
           hash = JSON.parse(body)
-          # assert message['event']['message'].include?('Reading File -- NameError: undefined local variable or method'), message['message']
-          # assert_equal level.to_s, message['event']['level']
-          # assert message['event']['backtrace'].include?(__FILE__), message['event']['backtrace']
           assert 'Reading File', hash['message']
           assert exception = hash['event']['exception']
           assert 'NameError', exception['name']
@@ -60,7 +57,7 @@ module Appender
           message = JSON.parse(body)
           assert_equal @message, message['event']['message']
           assert_equal level.to_s, message['event']['level']
-          refute message['event']['backtrace']
+          refute message['event']['stack_trace']
           assert_equal(1, message['event']['key1'], message)
           assert_equal('a', message['event']['key2'], message)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_logger
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 description: Next generation logging system for Ruby to support highly concurrent,
   high throughput, low latency enterprise systems
 email:
@@ -72,6 +58,7 @@ files:
 - lib/semantic_logger/semantic_logger.rb
 - lib/semantic_logger/version.rb
 - test/appender/bugsnag_test.rb
+- test/appender/elasticsearch_test.rb
 - test/appender/file_test.rb
 - test/appender/graylog_test.rb
 - test/appender/http_test.rb
@@ -107,12 +94,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Scalable, next generation enterprise logging for Ruby
 test_files:
 - test/appender/bugsnag_test.rb
+- test/appender/elasticsearch_test.rb
 - test/appender/file_test.rb
 - test/appender/graylog_test.rb
 - test/appender/http_test.rb