Fixed unhandled encoding exception when using the 'log-pattern' option

CHANGELOG.md

@@ -8,6 +8,7 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - ruby 2.4 testing (@majormoses)
 
 ### Fixed
+- Fixed unhandled encoding exception when using the `log-pattern` option (@jhshadi)
 - PR template spelling "compatibility"
 
 ## [1.2.0] - 2017-07-04

bin/check-log.rb

@@ -213,15 +213,11 @@ def search_log
     @log.seek(@bytes_to_skip, File::SEEK_SET) if @bytes_to_skip > 0
     # #YELLOW
     @log.each_line do |line|
+      line = encode_line(line)
       if config[:log_pattern]
         line = get_log_entry(line)
       end
 
-      if config[:encode_utf16]
-        line = line.encode('UTF-16', invalid: :replace, replace: '')
-      end
-
-      line = line.encode('UTF-8', invalid: :replace, replace: '')
       bytes_read += line.bytesize
       if config[:case_insensitive]
         m = line.downcase.match(config[:pattern].downcase) unless line.match(config[:exclude])
@@ -250,6 +246,8 @@ def get_log_entry(first_line)
     log_entry = [first_line]
 
     @log.each_line do |line|
+      line = encode_line(line)
+
       if !line.match(config[:log_pattern])
         log_entry.push(line)
       else
@@ -258,7 +256,14 @@ def get_log_entry(first_line)
       end
     end
 
-    log_entry = log_entry.join('')
-    log_entry
+    log_entry.join('')
+  end
+
+  def encode_line(line)
+    if config[:encode_utf16]
+      line = line.encode('UTF-16', invalid: :replace, replace: '')
+    end
+
+    line.encode('UTF-8', invalid: :replace, replace: '')
   end
 end