rails_log_deinterleaver 0.1.0 → 0.1.1

data/README.md

@@ -6,6 +6,7 @@ This gem includes a command line script to parse the interleaved logs and output
 
 Note that I am using syslog/rails 3 so the logs will be in a slightly different format that what rails will output by default in Rails 4. But this library could be easily updated to support both.
 
+[![Build Status](https://travis-ci.org/mattfawcett/rails_log_deinterleaver.svg?branch=master)](https://travis-ci.org/mattfawcett/rails_log_deinterleaver)
 
 Install
 -------
@@ -15,5 +16,5 @@ Use
 ---
 rails_log_deinterleaver [options] /path/to/interleaved/railslog.log
 ### possible options
--o, --output=x : Where to write the formatted log (if not specified stdout will be used)
--b, --backward=x : Start from the bottom of the file, x lines from the end. If not specified, the whole file will be parsed.
+* -o, --output=x : Where to write the formatted log (if not specified stdout will be used)
+* -b, --backward=x : Start from the bottom of the file, x lines from the end. If not specified, the whole file will be parsed.

data/lib/rails_log_deinterleaver/parser.rb

@@ -20,7 +20,7 @@ module RailsLogDeinterleaver
         self.ensure_timeouts_logged
       end
 
-      File.open(@filename) do |log|
+      File.open(@filename, 'r:UTF-8') do |log|
         log.extend(File::Tail)
         log.interval = 0.1
         log.backward(@options[:backward]) if @options[:backward]
@@ -31,6 +31,10 @@ module RailsLogDeinterleaver
     end
 
     def process_line(line)
+      # It is possible for the file to contain UTF-8 byte streams. Get rid of them here.
+      # String#encode does not do anything if source and destination encoding are the same,
+      # so encode to UTF-16 before converting back to UTF-8.
+      line = line.encode('UTF-16', :invalid => :replace, :replace => '').encode('UTF-8')
       pid = pid_for_line(line)
 
       if line.match(@options[:start_request_regex])
@@ -70,7 +74,9 @@ module RailsLogDeinterleaver
 
     def ensure_timeouts_logged
       expired_time = Time.now - @options[:request_timeout]
-      @pids.each do |pid, details|
+      # Loop over a clone of @pids because there is a chance that the parent thread
+      # will want to add to the @pids Hash whilst this is running, triggering an exception.
+      @pids.dup.each do |pid, details|
         if details[:last_seen_at] <= expired_time
           output_logs_for_pid(pid)
         end

data/lib/rails_log_deinterleaver/version.rb

@@ -1,3 +1,3 @@
 module RailsLogDeinterleaver
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_log_deinterleaver
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler