fix(containerlogs): avoid nil on empty log lines

sensu-plugins · Jun 29, 2018 · 0a97a54 · 0a97a54
1 parent 91d5efe
commit 0a97a54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ This CHANGELOG follows the format listed at [Our CHANGELOG Guidelines ](https://
 Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+### Fixed
+ - check-container-logs.rb: fix nil.gsub condition on empty log lines
 
 ## [3.1.0] - 2018-05-07
 ### Added

diff --git a/bin/check-container-logs.rb b/bin/check-container-logs.rb
@@ -138,7 +138,7 @@ def remove_headers(raw_logs)
     lines = raw_logs.split("\n")
     lines.map! do |line|
       # Check only logs generated with the 8 bits control
-      if !line.nil? && /^(0|1|2)000$/ =~ line.byteslice(0, 4).unpack('C*').join('')
+      if !line.nil? && line.bytesize > 8 && /^(0|1|2)000$/ =~ line.byteslice(0, 4).unpack('C*').join('')
         # Remove the first 8 bits and ansii colors too
         line.byteslice(8, line.bytesize).gsub(/\x1b\[[\d;]*?m/, '')
       end