logstash-input-redis 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad182690a7770eae7aea96b3f317cebce6c2e6c7
-  data.tar.gz: 228711379e887a580c9a999e0bb305fbc30d31ad
+  metadata.gz: b777765f982735709cf2e67c4ce6b642b92045d7
+  data.tar.gz: e042d3bacd003fb5ae8b8390bda58323a5d1a299
 SHA512:
-  metadata.gz: b5d962d59198462557c536881b0b977dad979ba0a666cf1d2d5ee1a499e3812800c0be33bf94eaf35035f6f6fbc8abf253a41068459018cb20e743a09d020c07
-  data.tar.gz: 6cbfbc1cbefd104c7574ef9a15e481f81a34539312f069c57d643f9b70a453a44fc2ae8221c53e9b43c522f05202a1a55536f89dcf8860a4b9bce5c662b7ae18
+  metadata.gz: 03ce249dd39dd6d5511fee10405ff570b2f8ed366fde799d7f46f4764beb9cb49f643dd8fb113adcdadd8c4c1071e091271e33ddb2c49cb4631406316a425fca
+  data.tar.gz: ef362960660c9ea2f8cba4db88186887db2372ee91b1ef8d6beba94c83190caad8548bd0e264f6525990d0b92b479b6809c58a23f346bd2f85bdb2d245bf1be6

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.2
+  - use correct unsubscribe method for channel_listener data type
+
 ## 3.1.1
   - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
 

data/lib/logstash/inputs/redis.rb

@@ -237,7 +237,11 @@ EOF
     # if its a SubscribedClient then:
     # it does not have a disconnect method (yet)
     if @redis.client.is_a?(::Redis::SubscribedClient)
-      @redis.client.unsubscribe
+      if @data_type == 'pattern_channel'
+        @redis.client.punsubscribe
+      else
+        @redis.client.unsubscribe
+      end
     else
       @redis.client.disconnect
     end

data/logstash-input-redis.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-redis'
-  s.version         = '3.1.1'
+  s.version         = '3.1.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This input will read events from a Redis instance"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/inputs/redis_spec.rb

@@ -240,7 +240,8 @@ describe LogStash::Inputs::Redis do
       allow(connection).to receive(:is_a?).and_return(true)
       allow(redis).to receive(:client).and_return(connection)
       expect(redis).to receive(:connected?).and_return(connected.last)
-      expect(connection).to receive(:unsubscribe)
+      allow(connection).to receive(:unsubscribe)
+      allow(connection).to receive(:punsubscribe)
 
       quit_calls.each do |call|
         expect(redis).to receive(call).at_most(:once)
@@ -303,8 +304,14 @@ describe LogStash::Inputs::Redis do
   end
 
   describe LogStash::Inputs::Redis do
-    it_behaves_like "an interruptible input plugin" do
-      let(:config) { {'key' => 'foo', 'data_type' => 'list'} }
+    context "when using data type" do
+      ["list", "channel", "pattern_channel"].each do |data_type|
+        context data_type do
+          it_behaves_like "an interruptible input plugin" do
+            let(:config) { {'key' => 'foo', 'data_type' => data_type } }
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-redis
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.3
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: This input will read events from a Redis instance