semantic_logger 4.0.0.beta1 → 4.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0753c0265adc4668e64539c5014d6ea98a9f5659
-  data.tar.gz: 4af0ca018bd158bccc8506985c84f8e29dad6d1f
+  metadata.gz: 3066e966beb70e220a27c8f45043eba84ce0a339
+  data.tar.gz: '08a10fa0381149833d7c39b2ae1d8d07c0ea2e4b'
 SHA512:
-  metadata.gz: eba4d620e6930c556912f8fc089326d3dbfca5bc8224e2949487509c70a37f332580ce96c78d06ae1249a15169930395a1697a012c687b2bbcf6aa58ce4d6138
-  data.tar.gz: 0206b4fedff5b5850d9f8541588263643f8a21a7c732a3845a12c6f4f94272ddc2042a613159fe8030e9f3855740d7461dc10885b24cbf2bd8071ce613361651
+  metadata.gz: 4ff7e40427736b675133b525f8da512c138c62194bb0225a01054b119ca83ab7d1352d7c6323e9da4a2edf94cbe27c1e98906bb6734dd0c1bcfa11d744b99f51
+  data.tar.gz: d58d10c056b3a73b3f1023eb3e3ce6548ef03171fe391e162aae7ab9effede30bdc995e0bca2b9496bb10cf61e6427d1fca42d7d59b990dc6edc191abd3a1d0c

data/lib/semantic_logger/appender/elasticsearch.rb

@@ -49,20 +49,21 @@ class SemanticLogger::Appender::Elasticsearch < SemanticLogger::Appender::Http
     @index        = options.delete(:index) || 'semantic_logger'
     @type         = options.delete(:type) || 'log'
     options[:url] ||= 'http://localhost:9200'
-
     super(options, &block)
+    @request_path = "#{@path.end_with?('/') ? @path : "#{@path}/"}#{@index}-%Y.%m.%d"
+    @logging_path = "#{@request_path}/#{type}"
   end
 
   # Log to the index for today
   def log(log)
     return false unless should_log?(log)
 
-    post(formatter.call(log, self), "#{index}-#{log.time.strftime('%Y.%m.%d')}/#{type}")
+    post(formatter.call(log, self), log.time.strftime(@logging_path))
   end
 
   # Deletes all log data captured for a day
   def delete_all(date = Date.today)
-    "#{index}-#{date.strftime('%Y.%m.%d')}/#{type}"
+    delete(date.strftime(@request_path))
   end
 
 end

data/lib/semantic_logger/appender/graylog.rb

@@ -103,6 +103,7 @@ class SemanticLogger::Appender::Graylog < SemanticLogger::Subscriber
     h[:timestamp]     = log.time.utc.to_f
     h[:level]         = logger.map_level(log)
     h[:level_str]     = log.level.to_s
+    h[:duration_str]  = h.delete(:duration)
     h[:short_message] = h.delete(:message) if log.message
     h
   end

data/lib/semantic_logger/appender/http.rb

@@ -101,12 +101,14 @@ class SemanticLogger::Appender::Http < SemanticLogger::Subscriber
 
     uri     = URI.parse(@url)
     @server = uri.host
-    raise(ArgumentError, "Invalid format for :url: #{@url.inspect}. Should be similar to: 'http://hostname:port/path'") unless @url
+    raise(ArgumentError, "Invalid format for :url: #{@url.inspect}. Should be similar to: 'http://hostname:port/path'") unless @server
 
     @port     = uri.port
     @username = uri.user if !@username && uri.user
     @password = uri.password if !@password && uri.password
     @path     = uri.path
+    # Path cannot be empty
+    @path     = '/' if @path == ''
 
     if uri.scheme == 'https'
       @ssl_options               ||= {}

data/lib/semantic_logger/base.rb

@@ -175,9 +175,9 @@ module SemanticLogger
     end
 
     # :nodoc:
-    def with_payload(payload)
+    def with_payload(payload, &block)
       warn '#with_payload is deprecated, use SemanticLogger.named_tagged'
-      SemanticLogger.named_tagged(payload)
+      SemanticLogger.named_tagged(payload, &block)
     end
 
     # :nodoc:

data/lib/semantic_logger/log.rb

@@ -67,7 +67,7 @@ module SemanticLogger
       # Except if there is an exception when it will always be logged
       if duration
         self.duration = duration
-        return false if (duration <= min_duration) && exception.nil?
+        return false if (duration < min_duration) && exception.nil?
       end
 
       self.message = message

data/lib/semantic_logger/semantic_logger.rb

@@ -52,7 +52,7 @@ module SemanticLogger
   # Returns [String] name of this host for logging purposes
   # Note: Not all appenders use `host`
   def self.host
-    @@host ||= Socket.gethostname
+    @@host ||= Socket.gethostname.force_encoding("UTF-8")
   end
 
   # Override the default host name

data/lib/semantic_logger/version.rb

@@ -1,3 +1,3 @@
 module SemanticLogger #:nodoc
-  VERSION = '4.0.0.beta1'
+  VERSION = '4.0.0.beta2'
 end

data/test/appender/elasticsearch_test.rb

@@ -20,7 +20,7 @@ module Appender
         @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
+        assert_equal "/semantic_logger-#{Time.now.utc.strftime('%Y.%m.%d')}/log", index
       end
 
       SemanticLogger::LEVELS.each do |level|

data/test/measure_test.rb

@@ -44,7 +44,7 @@ class MeasureTest < Minitest::Test
 
         describe ':min_duration' do
           it 'not log when faster' do
-            assert_equal 'result', @logger.send(measure_level, 'hello world', min_duration: 500) { 'result' } # Measure duration of the supplied block
+            assert_equal 'result', @logger.send(measure_level, 'hello world', min_duration: 1000) { 'result' } # Measure duration of the supplied block
             SemanticLogger.flush
             assert_nil @mock_logger.message
           end
@@ -104,7 +104,7 @@ class MeasureTest < Minitest::Test
 
         describe ':min_duration' do
           it 'not log when faster' do
-            assert_equal 'result', @logger.measure(level, 'hello world', min_duration: 500) { 'result' } # Measure duration of the supplied block
+            assert_equal 'result', @logger.measure(level, 'hello world', min_duration: 1000) { 'result' } # Measure duration of the supplied block
             SemanticLogger.flush
             assert_nil @mock_logger.message
           end
@@ -156,7 +156,7 @@ class MeasureTest < Minitest::Test
 
         describe ':min_duration' do
           it 'not log when faster' do
-            assert_equal 'result', @logger.send(measure_level, message: 'hello world', min_duration: 500) { 'result' } # Measure duration of the supplied block
+            assert_equal 'result', @logger.send(measure_level, message: 'hello world', min_duration: 1000) { 'result' } # Measure duration of the supplied block
             SemanticLogger.flush
             assert_nil @mock_logger.message
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_logger
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.beta2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby