aws-logs 0.2.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64ddf1d20fab423535f9f50bb65c10ae9be2130c57fbf15575a12ea5c3d63e96
-  data.tar.gz: f48a61b93834a37c64e22e088465f4d2212a863fc69c42214f250237713a4886
+  metadata.gz: 1b5f2fc9111e29b7a67550c1513dd21b67840279bd3c12538aa5532ef72b2ab4
+  data.tar.gz: e0913aae37e2d27b81959b47a9fa89a74724a2494ebffa956c27acfa982ec6bc
 SHA512:
-  metadata.gz: 1d362480e5d9aa1279ff5350bf685b3cdb350523f960e29a884106857c8a0f3033c9dc6974d778dc17971ca07c65d523b74da7b6e3e4f9e232331328bff801bc
-  data.tar.gz: 456686311206099c88a2f931e6369eb030145a97d3e45d54381b6e5a237b816bf5234bc029edd2fb0d6062e156d6092e6c4dec5ec7fe1753121c669227d1f6a9
+  metadata.gz: 2ddeb28e8dc13db69efcd1e6c861a4c08f8c800333dbdedb669ee56f6c9fe0fda57ae31c783aea91200156f22120a6cedace8fb2d7fff81d11e6ef537bd4b5cc
+  data.tar.gz: '091350a05ffecae55423ea1fcff0e6914b9db6bf8c8123749667d586fb5ae4459a12f58d02f29f9b2e6b92a8a7028482855536476f7b6604c820e671ded84ad8'

data/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.3.4]
+- set next_token for large filter_log_events responses
+
+## [0.3.3]
+- #2 add overlap to window to account for delayed logs received at the same time
+
+## [0.3.2]
+- #1 clean up end_loop_signal logic
+
+## [0.3.1]
+- fix --no-follow option
+
+## [0.3.0]
+- display final logs upon stop_follow!
+
 ## [0.2.0]
 - add stop_follow! method
 - friendly error message when log not found

data/README.md

@@ -1,6 +1,6 @@
 # aws-logs
 
-[![Gem Version](https://badge.fury.io/rb/GEMNAME.png)](http://badge.fury.io/rb/GEMNAME)
+[![Gem Version](https://badge.fury.io/rb/aws-logs.png)](http://badge.fury.io/rb/aws-logs)
 
 [![BoltOps Badge](https://img.boltops.com/boltops/badges/boltops-badge.png)](https://www.boltops.com)
 

data/lib/aws_logs/help/tail.md

@@ -41,7 +41,7 @@ Since supports these formats:
 * d - days
 * w - weeks
 
-Since does not current support combining the formats. IE: 5m30s.
+Since does not support combining the formats. IE: 5m30s.
 
 ## Filter Pattern
 
@@ -52,6 +52,6 @@ To match terms with spaces in it, you'll need quotes around it. Otherise, the ma
 
     aws-logs tail /aws/codebuild/demo --filter-pattern '"Wed Nov 27 23"' --since 3h --no-follow
 
-Here's an example of matching with an exclude patter using the `-` (minus sign).
+Here's an example of matching with an exclude pattern using the `-` (minus sign).
 
     aws-logs tail /aws/codebuild/demo --filter-pattern '"ERROR" - "Exiting"' --since 3h --no-follow

data/lib/aws_logs/tail.rb

@@ -8,7 +8,7 @@ module AwsLogs
       @options = options
       @log_group_name = options[:log_group_name]
       # Setting to ensure matches default CLI option
-      @follow = @options[:follow] || true
+      @follow = @options[:follow].nil? ? true : @options[:follow]
 
       @loop_count = 0
       @output = [] # for specs
@@ -35,14 +35,21 @@ module AwsLogs
         return
       end
 
+      # We overlap the sliding window because CloudWatch logs can receive or send the logs out of order.
+      # For example, a bunch of logs can all come in at the same second, but they haven't registered to CloudWatch logs
+      # yet. If we don't overlap the sliding window then we'll miss the logs that were delayed in registering.
+      overlap = 60*1000 # overlap the sliding window by a minute
       since, now = initial_since, current_now
-      while true && !end_loop?
+      until end_loop?
         refresh_events(since, now)
         display
-        since, now = now, current_now
+        since, now = now-overlap, current_now
         loop_count!
-        sleep 5 if @follow && !@@end_loop_signal && !ENV["AWS_LOGS_TEST"]
+        sleep 5 if @follow && !ENV["AWS_LOGS_TEST"]
       end
+      # Refresh and display a final time in case the end_loop gets interrupted by stop_follow!
+      refresh_events(since, now)
+      display
     rescue Aws::CloudWatchLogs::Errors::ResourceNotFoundException => e
       puts "ERROR: #{e.class}: #{e.message}".color(:red)
       puts "Log group #{@log_group_name} not found."
@@ -58,11 +65,13 @@ module AwsLogs
           log_group_name: @log_group_name, # required
           start_time: start_time,
           end_time: end_time,
-          # limit: 10,
+          # limit: 1000,
+          # interleaved: true,
         }
         options[:log_stream_names] = @options[:log_stream_names] if @options[:log_stream_names]
         options[:log_stream_name_prefix] = @options[:log_stream_name_prefix] if @options[:log_stream_name_prefix]
         options[:filter_pattern] = @options[:filter_pattern] if @options[:filter_pattern]
+        options[:next_token] = next_token if next_token != :start && !next_token.nil?
         resp = cloudwatchlogs.filter_log_events(options)
 
         @events += resp.events
@@ -97,9 +106,7 @@ module AwsLogs
       return unless follow_until
 
       messages = @events.map(&:message)
-      if messages.detect { |m| m.include?(follow_until) }
-        @@end_loop_signal = true
-      end
+      @@end_loop_signal = messages.detect { |m| m.include?(follow_until) }
     end
 
     def say(text)
@@ -110,15 +117,17 @@ module AwsLogs
       @output.join("\n") + "\n"
     end
 
-    @@end_loop_signal = false
     def set_trap
       Signal.trap("INT") {
         puts "\nCtrl-C detected. Exiting..."
-        @@end_loop_signal = true  # useful to control loop
         exit # immediate exit
       }
     end
 
+    # The stop_follow! results in a little waiting because it signals to break the polling loop.
+    # Since it's in the middle of the loop process, the loop will finish the sleep 5 first.
+    # So it can pause from 0-5 seconds.
+    @@end_loop_signal = false
     def self.stop_follow!
       @@end_loop_signal = true
     end

data/lib/aws_logs/version.rb

@@ -1,3 +1,3 @@
 module AwsLogs
-  VERSION = "0.2.0"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-logs
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport