logstash-input-cloudwatch 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a510dd0fdae41fa3f90b430beea28b6a19927861b5137bfd6965af7155b61797
-  data.tar.gz: e34c11c48c1566686479861d292f18c4ed11221287de3fe0efb53fa3afb28dae
+  metadata.gz: a757033201d4a0fdb0be8dee7bb5af1f2c006e313063994f04a6ede079d7dc1f
+  data.tar.gz: f05592b5ea230907679d93be0dfdd8c5fc203b04efeb0c8b8c7bd31c5bc6c9bf
 SHA512:
-  metadata.gz: b250a0540c6d2eb54c8e5d1bfcc4ecfeedd6b7c8491f7bebdcca7733fad76e263196cf21e8ac35cc41899281917bdd30768da28c2b4fd2340070a2079cd99533
-  data.tar.gz: 71f11bf11b1c342fba686c6eb2f0aa6108197f4323e9f1b65b0f12c00a4ac36833d550a7ada04c972bf33b0e89bc6b1d2182943618f3096674c26155a1999490
+  metadata.gz: 242e72c4deccedaf1c0f301a18c3477c5d9ee766f577d105eac80cc6f40d01342254909a5334788ed7859c93ca23d73f9b791b78dae4b8a3a109c90285a9099f
+  data.tar.gz: acefeb53a70030356ca7c97226ac9aa582b82f0d6eae426ef686c74ae601d8ecd636508368e0a6234feb76ae843fffb8a5c13f5c213f709177fba4792269c308

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.2.4
+  - Fixed shutdown handling [#43](https://github.com/logstash-plugins/logstash-input-cloudwatch/pull/43)
+
 ## 2.2.3
   - Fixed issue where metric timestamp was being lost due to over-writing by end_time [#38](https://github.com/logstash-plugins/logstash-input-cloudwatch/pull/38)
 

data/lib/logstash/inputs/cloudwatch.rb

@@ -146,7 +146,9 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
   #
   # @param queue [Array] Logstash queue
   def run(queue)
-    Stud.interval(@interval) do
+    while !stop?
+      start = Time.now
+
       @logger.info('Polling CloudWatch API')
 
       raise 'No metrics to query' unless metrics_for(@namespace).count > 0
@@ -161,6 +163,8 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
           @combined ? from_filters(queue, metric) : from_resources(queue, metric)
         end
       end
+      sleep_for = @interval - (Time.now - start)
+      Stud.stoppable_sleep(sleep_for) { stop? } if sleep_for > 0
     end # loop
   end # def run
 

data/logstash-input-cloudwatch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-cloudwatch'
-  s.version         = '2.2.3'
+  s.version         = '2.2.4'
   s.licenses      = ['Apache-2.0']
   s.summary       = "Pulls events from the Amazon Web Services CloudWatch API "
   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/cloudwatch_spec.rb

@@ -51,6 +51,19 @@ describe LogStash::Inputs::CloudWatch do
     end
   end
 
+  describe 'shutdown' do
+    let(:metrics) { double("metrics") }
+    let(:config) { super().merge('namespace' => 'AWS/EC2') }
+
+    before do
+      allow(subject).to receive(:metrics_for).and_return(metrics)
+      allow(metrics).to receive(:count).and_return(1)
+      allow(metrics).to receive(:each).and_return(['DiskWriteBytes'])
+    end
+
+    it_behaves_like "an interruptible input plugin"
+  end
+
   describe '#register' do
 
     context "EC2 namespace" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement