cloud_watch_logs_poller 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4641f0ec6db0d868154a40d3ac82a525c00d57ad3b51297a2078341397455a85
-  data.tar.gz: 486c7f3b586fbca8b079231df5f8bf979c5112aab5d04110a1ad983adee87570
+  metadata.gz: ed9924117eb330ef1c01a77a0647c92b4af1d5a5b0aaa35172808f3492d9e834
+  data.tar.gz: c43befd252982a7ea7e47fefa369df6b0f7eb5baa1a75e563564c2fdb8c2cba7
 SHA512:
-  metadata.gz: 35d9d853b1ee7192cca26901b1f4ae8a72a21652c3935b090f7a98dc757f5abcd7903a65bdf480c5654c5c7596db7520331289383a2a2c92a7bab0840193a989
-  data.tar.gz: f146bb5eb28ce03faf8198ceed4df78db65ea57e8d716d0096dc19b09b3c325c1405482fa91c5eaad5a8d319dfb209acc18e6fff787b5d88b93ba67c0b8e7332
+  metadata.gz: 39b5ea7367cb0f7a73e8094a13b90dd6279458a40e1e59532e988f51af2f022b0b1f3c51196eb7740fa17f024139236ea62c006c85bbc858346fbcbb13236ac0
+  data.tar.gz: 49dc2306411267e01d0b551a5fd33ddac222b2cccb5661198446047ad14c0d15790aa3490ee4318194f4c4505663303c1e52b34ecea5ec46ef1a4869ca9a5248

data/cloud_watch_logs_poller.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-cloudwatchlogs", "~> 1.0"
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/cloud_watch_logs_poller/process.rb

@@ -4,7 +4,8 @@ module CloudWatchLogsPoller
       @client = Aws::CloudWatchLogs::Client.new
       @interval = interval
       @debug = debug
-      @event_ids_by_timestamp = {}
+      @event_ids = Set.new
+      @max_timestamp = 0
     end
 
     def execute(log_group_name:, log_stream_name_prefix: nil, filter_pattern: nil, start_time: Time.now, &block)
@@ -24,28 +25,26 @@ module CloudWatchLogsPoller
           result.events.each do |event|
             timestamp = event.timestamp&.to_i
             event_id = event.event_id
+            @max_timestamp = timestamp if timestamp > @max_timestamp
 
             debug_log("timestamp = #{timestamp}")
 
-            @event_ids_by_timestamp[timestamp] ||= Set.new
-            next if @event_ids_by_timestamp[timestamp].include?(event_id)
+            next if @event_ids.include?(event_id)
 
-            @event_ids_by_timestamp[timestamp] << event_id
+            @event_ids << event_id
             block.call(Event.convert_from_filtered_log_event(event))
           end
 
           debug_log(params)
 
-          @event_ids_by_timestamp = get_latest_events_and_timestamp
           break unless result.next_token
 
           params[:next_token] = result.next_token
         end
 
-        newest_timestamp = @event_ids_by_timestamp.keys.max
-        params[:start_time] = newest_timestamp unless newest_timestamp.nil?
+        params[:start_time] = @max_timestamp + 1 if @max_timestamp > 0
         params[:next_token] = nil
-        @event_ids_by_timestamp = {}
+        @event_ids = Set.new
 
         sleep(@interval)
       end
@@ -55,13 +54,6 @@ module CloudWatchLogsPoller
 
     private
 
-    def get_latest_events_and_timestamp
-      newest_timestamp = @event_ids_by_timestamp.keys.max
-      return {} if newest_timestamp.nil?
-
-      {newest_timestamp => @event_ids_by_timestamp[newest_timestamp]}
-    end
-
     def debug_log(message)
       return unless @debug
 

data/lib/cloud_watch_logs_poller/version.rb

@@ -1,3 +1,3 @@
 module CloudWatchLogsPoller
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloud_watch_logs_poller
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Takahiro Ooishi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatchlogs
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ files:
 homepage: https://github.com/taka0125/cloud_watch_logs_poller
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Polling Cloud Watch Logs
 test_files: []