logstash-input-cloudflare 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1092862dc49784086c7b33ee78df8cb6596b1b3a
-  data.tar.gz: ce657c567f7a9c2571c723cadb6f2ef598064ae5
+  metadata.gz: 085cf38020417111f4172fe95693004884b01246
+  data.tar.gz: 3425837336a0f57199abcc04f9c4eb960277d867
 SHA512:
-  metadata.gz: b983c8fbb702181e88324e6a2ffd00731ec9793d379d918600a84807fc787b697f2d584f6607ebd816432a49b18794cf6ce021ac60f411d4832b51ea417d4c9f
-  data.tar.gz: 4473dff4ebf3284cf66d242e939ea6693f6f84dfca74d3524924f46420eede05b4fbfea99274347ba177148959eb5d2f02fa36de1e53edc67fb6f316b699a53b
+  metadata.gz: f094121047dd883418352a333ad2fc45dcf1e23a17bfd7bb2f888bffa1affe4b12b018798d03bd373ff3df1de87b6ea763aaf3f456c0410b46f0613de5f2fba7
+  data.tar.gz: 02388bd90d140c45298c30b26e640e201d95865fdf72cb8c0cddc0e7caafd71a7617fd4b42b77a82efed035feca1d5741f1b078b042f8cc81cf4d31ad908e484

data/lib/logstash/inputs/cloudflare.rb

@@ -235,16 +235,19 @@ class LogStash::Inputs::Cloudflare < LogStash::Inputs::Base
           metadata['last_timestamp'] = entry['timestamp'] / 1_000_000_000
         end
         @logger.info(metadata)
-        if !metadata['last_timestamp'] && metadata['first_timestamp']
+        if metadata['first_timestamp']
+          mod_tstamp = metadata['first_timestamp'].to_i + 120
+        else
+          mod_tstamp = nil
+        end
+        if !metadata['last_timestamp'] && metadata['first_timestamp'] && \
+           mod_tstamp <= metadata['default_start_time']
           # we need to increment the timestamp by 2 minutes as we haven't
           # received any results in the last batch ... also make sure we
           # only do this if the end date is more than 10 minutes from the
           # current time
-          mod_tstamp = metadata['first_timestamp'].to_i + 120
-          unless mod_tstamp > metadata['default_start_time']
-            @logger.info('Incrementing start timestamp by 120 seconds')
-            metadata['last_timestamp'] = mod_tstamp
-          end
+          @logger.info('Incrementing start timestamp by 120 seconds')
+          metadata['last_timestamp'] = mod_tstamp
         else # if
           @logger.info("Waiting #{@poll_time} seconds before requesting data"\
                        'from Cloudflare again')

data/logstash-input-cloudflare.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-cloudflare'
-  s.version = '0.9.1'
+  s.version = '0.9.2'
   s.licenses = ['Apache License (2.0)']
   s.summary = 'This logstash input plugin fetches logs from Cloudflare using'\
               'their API'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-cloudflare
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Igor Serko