logstash-logger 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fab14d9b4a0659c6e51012c5e3a48b80f76eeb2f
-  data.tar.gz: 9038880300cacd6917f1f9910a46cec603a8bcbe
+  metadata.gz: 7252b0c419a23b78262ae3cb1233d3cdab342b4d
+  data.tar.gz: e50db430b6b01ca9ef364a91667bc200f302bdd8
 SHA512:
-  metadata.gz: 4143b7b206ed3e13c774c44d749544ac455a73b3cafaf845baa4b84c6dc27e0a49b157c2c0f29344c0488a2734beb3a5557f4c9be0afa92a123bd7e1f63b5ab1
-  data.tar.gz: 250480625ad0520d6e86b78dda4c64b36c235e0d3ff4fbd6467dd7895f0eb5338eb8a407665b4a0dbc691cf9918088036db443d4c9137b5c4df37ef8dad6e63e
+  metadata.gz: 6444602d1b40ee1a64c4af04fbcdbbb67fac1094c8921a521b0bcbc5af2ca65b16438ac32207f785dbe50bc2c324c55dcc0059759c0f93163cf681aa419db3cd
+  data.tar.gz: 5a3a64a0566313c5cf593e56455009d1a45bb4575097375947937113f8d9af87fe5f1bb79e4aa8ec9fb7bc37e856437f48b64c3a20f2c8c2cb180db8e473814f

data/CHANGELOG.md

@@ -1,44 +1,33 @@
+## 0.10.3
+- Merge URI and non-URI configuration. [#54](https://github.com/dwbutler/logstash-logger/pull/54) 
+
 ## 0.10.2
-- Fix for Custom Events can't access tags from Tagged Logging
-Fixes [#48](https://github.com/dwbutler/logstash-logger/issues/48).
-Thanks [Anil Rhemtulla](https://github.com/AnilRh)!
+- Fix for Custom Events can't access tags from Tagged Logging. [#48](https://github.com/dwbutler/logstash-logger/issues/48)
 
 ## 0.10.1
-- Fix for Redis URI parsing issue.
-Fixes [#41](https://github.com/dwbutler/logstash-logger/issues/41).
-Thanks [Vadim Kazakov](https://github.com/yads)!
+- Fix for Redis URI parsing issue. [#41](https://github.com/dwbutler/logstash-logger/issues/41)
 
 ## 0.10.0
-- Support for logging to Kafka.
-Fixes [#37](https://github.com/dwbutler/logstash-logger/issues/37).
-Thanks [Felix Bechstein](https://github.com/felixb)!
+- Support for logging to Kafka. [#37](https://github.com/dwbutler/logstash-logger/issues/37)
 
 ## 0.9.0
-- Support for customizing the fields on all logged messages via configuration.
-Fixes [#32](https://github.com/dwbutler/logstash-logger/pull/32).
-Thanks [Chris Blatchley](https://github.com/chrisblatchley)!
+- Support for customizing the fields on all logged messages via configuration. [#32](https://github.com/dwbutler/logstash-logger/pull/32)
 
 ## 0.8.0
-- Support for logging to stderr. Fixes [#24](https://github.com/dwbutler/logstash-logger/pull/25).
-Thanks [Jan Schulte](https://github.com/schultyy)!
-- Support multiple log outputs. Fixes [#28](https://github.com/dwbutler/logstash-logger/pull/28).
-Thanks [Kurt Preston](https://github.com/KurtPreston)!
+- Support for logging to stderr. [#24](https://github.com/dwbutler/logstash-logger/pull/25)
+- Support multiple log outputs. [#28](https://github.com/dwbutler/logstash-logger/pull/28)
 
 ## 0.7.0
 - Support for logging to a generic IO object.
-- Support for overriding IO in stdout logger. Fixes [#20](https://github.com/dwbutler/logstash-logger/pull/20).
-Thanks [Arron Mabrey](https://github.com/arronmabrey)!
-- Support for configuring logger with a URI. See [#22](https://github.com/dwbutler/logstash-logger/pull/22).
-Thanks [Arron Mabrey](https://github.com/arronmabrey)!
-- Support logging any object. See [#23](https://github.com/dwbutler/logstash-logger/issues/23).
+- Support for overriding IO in stdout logger. [#20](https://github.com/dwbutler/logstash-logger/pull/20)
+- Support for configuring logger with a URI. [#22](https://github.com/dwbutler/logstash-logger/pull/22)
+- Support logging any object. [#23](https://github.com/dwbutler/logstash-logger/issues/23)
 
 ## 0.6.2
-- Allow type to be specified as a string. Fixes [#19](https://github.com/dwbutler/logstash-logger/pull/19).
-Thanks [Arron Mabrey](https://github.com/arronmabrey)!
+- Allow type to be specified as a string. [#19](https://github.com/dwbutler/logstash-logger/pull/19)
 
 ## 0.6.1
-- Don't mutate options passed to LogStashLogger. Fixes [#18](https://github.com/dwbutler/logstash-logger/pull/18).
-Thanks [Arron Mabrey](https://github.com/arronmabrey)!
+- Don't mutate options passed to LogStashLogger. [#18](https://github.com/dwbutler/logstash-logger/pull/18)
 
 ## 0.6.0
 - Support for logging to a file.
@@ -49,10 +38,10 @@ Thanks [Arron Mabrey](https://github.com/arronmabrey)!
 
 ## 0.5.0
 - Support for tagged logging. The interface was extracted from `ActiveSupport::TaggedLogging`
-and outputs to the `tags` key. (Thanks [pctj101](https://github.com/pctj101)!)
+and outputs to the `tags` key.
 - The `(host, port, type)` constructor has been deprecated in favor of an options hash constructor.
-- Support for using SSL for TCP connections. (Thanks [Gary Rennie](https://github.com/Gazler)!)
-- Support for configuring logger to write to STDOUT. (Thanks [Nick Ethier](https://github.com/nickethier)!)
+- Support for using SSL for TCP connections.
+- Support for configuring logger to write to STDOUT.
 - Support for Rails configuration.
 - Fixed output to STDOUT in Rails console (Rails 4+).
 - `host` is no longer required for TCP/UDP. It will default to `0.0.0.0`, the same default port that logstash listens on.

data/README.md

@@ -183,6 +183,7 @@ This configuration would result in the following output.
 }
 ```
 
+
 ## Rails Integration
 
 Verified to work with both Rails 3 and 4.
@@ -337,6 +338,35 @@ config.logstash = [
 ]
 ```
 
+### Logging HTTP request data
+
+In web applications, you can log data from HTTP requests (such as headers) using the
+[RequestStore](https://github.com/steveklabnik/request_store) middleware. The following
+example assumes Rails.
+
+```ruby
+# in Gemfile
+gem 'request_store'
+```
+
+```ruby
+# in application.rb
+LogStashLogger.configure do |config|
+  config.customize_event do |event|
+    event["session_id"] = RequestStore.store[:load_balancer_session_id]
+  end
+end
+```
+
+```ruby
+# in app/controllers/application_controller.rb
+before_filter :track_load_balancer_session_id
+
+def track_load_balancer_session_id
+  RequestStore.store[:load_balancer_session_id] = request.headers["X-LOADBALANCER-SESSIONID"]
+end
+```
+
 ## Ruby Compatibility
 
 Verified to work with:

data/lib/logstash-logger/device.rb

@@ -35,7 +35,8 @@ module LogStashLogger
 
     def self.build_device(opts)
       if parsed_uri_opts = parse_uri_config(opts)
-        opts = parsed_uri_opts
+        opts.delete(:uri)
+        opts.merge!(parsed_uri_opts)
       end
 
       type = opts.delete(:type) || DEFAULT_TYPE

data/lib/logstash-logger/version.rb

@@ -1,3 +1,3 @@
 module LogStashLogger
-  VERSION = "0.10.2"
+  VERSION = "0.10.3"
 end

data/spec/device_spec.rb

@@ -70,6 +70,12 @@ describe LogStashLogger::Device do
     context "when URI config is redis" do
       let(:uri_config) { redis_uri_config }
       it { is_expected.to be_a LogStashLogger::Device::Redis }
+      context "list specified" do
+        let(:uri_config) { redis_uri_config.merge({list: 'mylist'}) }
+        it 'is expected to have the list option set' do
+          expect(new_device.list).to eq('mylist')
+        end
+      end
     end
 
     context "when URI config is kafka" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-logger
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - David Butler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event