request-log-analyzer 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d13886d7138b18ba797c914464ef06cf638b14d
-  data.tar.gz: 1e9b4a62e67715bcf782a8c5f30fa1740ce93578
+  metadata.gz: c24635e41e1a2f3e4c11e6f4814cd9381b0d5073
+  data.tar.gz: 0b70d1e886d4a1ca41361023aee81d7d63acb1fa
 SHA512:
-  metadata.gz: 910de9082b59c474b65fb4a618280e99e143194fbc2e0689fdca1eebdbc4beece89572924a8bf148a8ecf9d6f455a4fc745ad6fa1f8a43447b4a09cb7f78838e
-  data.tar.gz: bfa3b1e2e4cef2e005348faf503541aafbf0ce1e0e522a5b6ff192c369dfb032553cba3f0ced93808fb69c044b43fa3723d0d6491b41d31527034babf1b70116
+  metadata.gz: 605898a6b50c9e528c3807e92a3fa98effdd7ddbcb85391312e15f30e101612e10f0c6710891b1804d94aa25cc5a99cbd37fd90dcad7da0c91d400e89822b3da
+  data.tar.gz: e617b1756392fe884a0355e06281302d32c6899832482e4f750b237dae34e75763e702b1bc500d6a297a25591dabfa1a1859569ed417cab48ef008a37dc74776

data/.travis.yml

@@ -10,7 +10,7 @@ rvm:
   - ruby-head
   - jruby-19mode
   - jruby-head
-  - rbx
+  - rbx-2
 gemfile:
   - Gemfile.activerecord3
   - Gemfile.activerecord4
@@ -18,7 +18,7 @@ matrix:
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
-    - rvm: rbx
+    - rvm: rbx-2
 notifications:
   email:
     - info@railsdoctors.com

data/bin/request-log-analyzer

@@ -36,6 +36,8 @@ begin
     command_line.option(:file, :alias => :e)
     command_line.option(:mail, :alias => :m)
     command_line.option(:mailhost, :default => 'localhost')
+    command_line.option(:mailfrom)
+    command_line.option(:mailfrom_name)
     command_line.option(:mailsubject)
     command_line.option(:parse_strategy, :default => 'assume-correct')
     command_line.option(:yaml)
@@ -88,6 +90,8 @@ rescue CommandLine::Error => e
   puts "  --file <filename>          Redirect output to file."
   puts "  --mail <emailaddress>      Send report to an email address."
   puts "  --mailhost <server>        Use the given server as the SMTP server for sending email."
+  puts "  --mailfrom <address>       Overwrite default email sender address."
+  puts "  --mailfrom-name <name>     Overwrite default email sender name."
   puts "  --mailsubject <text>       Overwrite default mailsubject."
   puts "  --no-progress              Hide the progress bar."
   puts "  --output <format>          Output format. Supports 'html' and 'fixed_width'."

data/lib/request_log_analyzer/aggregator/summarizer.rb

@@ -109,7 +109,7 @@ module RequestLogAnalyzer::Aggregator
       output.with_style(:cell_separator => false) do
         output.table({:width => 20}, {:font => :bold}) do |rows|
           source.processed_files.each do |f|
-            rows << ['Processsed File:', f]
+            rows << ['Processed File:', f]
           end
           rows << ['Parsed lines:',     source.parsed_lines]
           rows << ['Skipped lines:',    source.skipped_lines]

data/lib/request_log_analyzer/controller.rb

@@ -43,6 +43,8 @@ module RequestLogAnalyzer
       options[:report_sort]    = arguments[:report_sort]
       options[:report_amount]  = arguments[:report_amount]
       options[:mailhost]       = arguments[:mailhost]
+      options[:mailfrom]       = arguments[:mailfrom]
+      options[:mailfrom_name]  = arguments[:mailfrom_name]
       options[:mailsubject]    = arguments[:mailsubject]
       options[:silent]         = arguments[:silent]
       options[:parse_strategy] = arguments[:parse_strategy]
@@ -106,6 +108,8 @@ module RequestLogAnalyzer
     # * <tt>:format</tt> :rails, {:apache => 'FORMATSTRING'}, :merb, :amazon_s3, :mysql or RequestLogAnalyzer::FileFormat class. (Defaults to :rails).
     # * <tt>:mail</tt> Email the results to this email address.
     # * <tt>:mailhost</tt> Email the results to this mail server.
+    # * <tt>:mailfrom</tt> Set the Email sender address.
+    # * <tt>:mailfrom_alias</tt> Set the Email sender name.
     # * <tt>:mailsubject</tt> Email subject.
     # * <tt>:no_progress</tt> Do not display the progress bar (increases parsing speed).
     # * <tt>:output</tt> 'FixedWidth', 'HTML' or RequestLogAnalyzer::Output class. Defaults to 'FixedWidth'.
@@ -165,7 +169,7 @@ module RequestLogAnalyzer
         output_object = %w[File StringIO].include?(options[:file].class.name) ? options[:file] : File.new(options[:file], "w+")
         output_args   = {:width => 80, :color => false, :characters => :ascii, :sort => output_sort, :amount => output_amount }
       elsif options[:mail]
-        output_object = RequestLogAnalyzer::Mailer.new(options[:mail], options[:mailhost], :subject => options[:mailsubject])
+        output_object = RequestLogAnalyzer::Mailer.new(options[:mail], options[:mailhost], :subject => options[:mailsubject], :from => options[:mailfrom], :from_alias => options[:mailfrom_name])
         output_args   = {:width => 80, :color => false, :characters => :ascii, :sort => output_sort, :amount => output_amount  }
       else
         output_object = STDOUT

data/lib/request_log_analyzer/file_format.rb

@@ -15,6 +15,7 @@ module RequestLogAnalyzer::FileFormat
   autoload :DelayedJob2,      'request_log_analyzer/file_format/delayed_job2'
   autoload :DelayedJob21,     'request_log_analyzer/file_format/delayed_job21'
   autoload :DelayedJob3,      'request_log_analyzer/file_format/delayed_job3'
+  autoload :DelayedJob4,      'request_log_analyzer/file_format/delayed_job4'
   autoload :Apache,           'request_log_analyzer/file_format/apache'
   autoload :AmazonS3,         'request_log_analyzer/file_format/amazon_s3'
   autoload :W3c,              'request_log_analyzer/file_format/w3c'

data/lib/request_log_analyzer/file_format/delayed_job4.rb

@@ -0,0 +1,54 @@
+module RequestLogAnalyzer::FileFormat
+
+  # The DelayedJob4 file format parsed log files that are created by DelayedJob 4.0 or higher.
+  # By default, the log file can be found in RAILS_ROOT/log/delayed_job.log
+  class DelayedJob4 < Base
+
+    extend CommonRegularExpressions
+
+    line_definition :job_completed do |line|
+      line.header = true
+      line.footer = true
+      line.regexp = /(#{timestamp('%Y-%m-%dT%H:%M:%S%z')}): \[Worker\(\S+ host:(#{hostname_or_ip_address}) pid:(\d+)\)\] Job (.+) \(id=\d+\) COMPLETED after (\d+\.\d+)/
+      line.capture(:timestamp).as(:timestamp)
+      line.capture(:host)
+      line.capture(:pid).as(:integer)
+      line.capture(:job)
+      line.capture(:duration).as(:duration, :unit => :sec)
+    end
+
+    line_definition :job_failed do |line|
+      line.header = true
+      line.footer = true
+      line.regexp = /(#{timestamp('%Y-%m-%dT%H:%M:%S%z')}): \[Worker\(\S+ host:(#{hostname_or_ip_address}) pid:(\d+)\)\] Job (.+) FAILED \((\d+) prior attempts\) with (.+)/
+      line.capture(:timestamp).as(:timestamp)
+      line.capture(:host)
+      line.capture(:pid).as(:integer)
+      line.capture(:job)
+      line.capture(:attempts).as(:integer)
+      line.capture(:error)
+    end
+
+    line_definition :job_deleted do |line|
+      line.header = true
+      line.footer = true
+      line.regexp = /(#{timestamp('%Y-%m-%dT%H:%M:%S%z')}): \[Worker\(\S+ host:(#{hostname_or_ip_address}) pid:(\d+)\)\] Job (.+) REMOVED permanently because of (\d+) consecutive failures/
+      line.capture(:timestamp).as(:timestamp)
+      line.capture(:host)
+      line.capture(:pid).as(:integer)
+      line.capture(:job)
+      line.capture(:failures).as(:integer)
+    end
+
+
+    report do |analyze|
+      analyze.timespan
+      analyze.hourly_spread
+
+      analyze.frequency :job, :line_type => :job_completed, :title => "Completed jobs"
+      analyze.frequency :job, :category => lambda { |r| "#{r[:job]} #{r[:error]}" }, :line_type => :job_failed, :title => "Failed jobs"
+      analyze.frequency :failures, :category => :job, :line_type => :job_deleted, :title => "Deleted jobs"
+      analyze.duration :duration, :category => :job, :line_type => :job_completed, :title => "Job duration"
+    end
+  end
+end

data/lib/request_log_analyzer/request.rb

@@ -38,8 +38,7 @@ module RequestLogAnalyzer
       # Converts :eval field, which should evaluate to a hash.
       def convert_eval(value, capture_definition)
         eval(sanitize_parameters(value)).inject({}) { |h, (k, v)| h[k.to_sym] = v; h}
-			# Wide range of errors possible with wild eval. ATM we choose to crash on this.
-      rescue SyntaxError 
+      rescue
         nil
       end
 

data/lib/request_log_analyzer/version.rb

@@ -1,3 +1,3 @@
 module RequestLogAnalyzer
-  VERSION = "1.13.0"
+  VERSION = "1.13.1"
 end

data/spec/integration/mailer_spec.rb

@@ -52,6 +52,36 @@ describe RequestLogAnalyzer, 'running mailer integration' do
     find_string_in_file("Subject: TESTSUBJECT", @log_file).should_not be_nil
   end
 
+  it "should allow a custom mail sender address" do
+    RequestLogAnalyzer::Controller.build(
+      :mail         => 'root@localhost',
+      :mailhost     => 'localhost:2525',
+      :mailfrom     => 'customaddr@example.com',
+      :source_files => log_fixture(:rails_1x),
+      :format       => RequestLogAnalyzer::FileFormat::Rails,
+      :no_progress  => true
+    ).run!
+
+    Process.wait # Wait for mailer to complete
+
+    find_string_in_file("From: Request-log-analyzer reporter <customaddr@example.com>", @log_file).should_not be_nil
+  end
+
+  it "should allow a custom mail sender name" do
+    RequestLogAnalyzer::Controller.build(
+      :mail         => 'root@localhost',
+      :mailhost     => 'localhost:2525',
+      :mailfrom_name => 'Custom Name',
+      :source_files => log_fixture(:rails_1x),
+      :format       => RequestLogAnalyzer::FileFormat::Rails,
+      :no_progress  => true
+    ).run!
+
+    Process.wait # Wait for mailer to complete
+
+    find_string_in_file("From: Custom Name <contact@railsdoctors.com>", @log_file).should_not be_nil
+  end
+
   it "should send html mail" do
     RequestLogAnalyzer::Controller.build(
       :output       => 'HTML',

data/spec/unit/file_format/delayed_job4_format_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe RequestLogAnalyzer::FileFormat::DelayedJob do
+
+  subject { RequestLogAnalyzer::FileFormat.load(:delayed_job4) }
+
+  it { should be_well_formed }
+  it { should have_line_definition(:job_completed).capturing(:timestamp, :duration, :host, :pid, :job) }
+  it { should have_line_definition(:job_failed).capturing(:timestamp, :host, :pid, :job, :attempts, :error) }
+  it { should have_line_definition(:job_deleted).capturing(:timestamp, :host, :pid, :job, :failures) }
+  it { should have(6).report_trackers }
+
+
+  describe '#parse_line' do
+
+    let(:job_completed_sample) { '2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] Job S3FileJob.create (id=534785) COMPLETED after 1.0676' }
+    let(:job_failed_sample) { '2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] Job S3FileJob.create (id=534785) FAILED (0 prior attempts) with SocketError: getaddrinfo: Name or service not known' }
+    let(:job_deleted_sample) { '2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] Job S3FileJob.create (id=534785) REMOVED permanently because of 25 consecutive failures' }
+
+    it { should parse_line(job_completed_sample).as(:job_completed).and_capture(
+          :timestamp => 20100517173735, :duration => 1.0676, :host => 'hostname.co.uk', :pid => 11888, :job => 'S3FileJob.create') }
+
+    it { should parse_line(job_failed_sample).as(:job_failed).and_capture(
+          :timestamp => 20100517173735, :host => 'hostname.co.uk', :pid => 11888, :job => 'S3FileJob.create (id=534785)', :attempts => 0, :error => "SocketError: getaddrinfo: Name or service not known") }
+
+    it { should parse_line(job_deleted_sample).as(:job_deleted).and_capture(
+          :timestamp => 20100517173735, :host => 'hostname.co.uk', :pid => 11888, :job => 'S3FileJob.create (id=534785)', :failures => 25) }
+
+    it { should_not parse_line('nonsense', 'a nonsense line') }
+  end
+
+
+  describe '#parse_io' do
+    let(:log_parser) { RequestLogAnalyzer::Source::LogParser.new(subject) }
+
+    it "should parse a batch of completed jobs without warnings" do
+      fragment = log_snippet(<<-EOLOG)
+        2010-05-17T17:36:44+0000: *** Starting job worker delayed_job host:hostname.co.uk pid:11888
+        2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] Job S3FileJob (id=534785) COMPLETED after 1.0676
+        2010-05-17T17:37:37+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] Job S3FileJob (id=534788) COMPLETED after 1.4407
+        2010-05-17T17:37:44+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] Job S3FileJob (id=534789) COMPLETED after 6.9374
+        2010-05-17T17:37:44+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] 3 jobs processed at 0.3163 j/s, 0 failed
+        2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] Job S3FileJob.create (id=534786) FAILED (25 prior attempts) with SocketError: getaddrinfo: Name or service not known
+        2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] Job S3FileJob.create (id=534799) REMOVED permanently because of 25 consecutive failures
+        2010-05-19T11:47:26+0000: Exiting...
+      EOLOG
+
+      log_parser.should_receive(:handle_request).exactly(5).times
+      log_parser.parse_io(fragment)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request-log-analyzer
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Willem van Bergen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -148,6 +148,7 @@ files:
 - lib/request_log_analyzer/file_format/delayed_job2.rb
 - lib/request_log_analyzer/file_format/delayed_job21.rb
 - lib/request_log_analyzer/file_format/delayed_job3.rb
+- lib/request_log_analyzer/file_format/delayed_job4.rb
 - lib/request_log_analyzer/file_format/haproxy.rb
 - lib/request_log_analyzer/file_format/merb.rb
 - lib/request_log_analyzer/file_format/mysql.rb
@@ -235,6 +236,7 @@ files:
 - spec/unit/file_format/delayed_job21_format_spec.rb
 - spec/unit/file_format/delayed_job2_format_spec.rb
 - spec/unit/file_format/delayed_job3_format_spec.rb
+- spec/unit/file_format/delayed_job4_format_spec.rb
 - spec/unit/file_format/delayed_job_format_spec.rb
 - spec/unit/file_format/file_format_api_spec.rb
 - spec/unit/file_format/format_autodetection_spec.rb
@@ -291,7 +293,7 @@ requirements:
 - To use the database inserter, ActiveRecord and an appropriate database adapter are
   required.
 rubyforge_project: r-l-a
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A command line tool to analyze request logs for Apache, Rails, Merb, MySQL
@@ -351,6 +353,7 @@ test_files:
 - spec/unit/file_format/delayed_job21_format_spec.rb
 - spec/unit/file_format/delayed_job2_format_spec.rb
 - spec/unit/file_format/delayed_job3_format_spec.rb
+- spec/unit/file_format/delayed_job4_format_spec.rb
 - spec/unit/file_format/delayed_job_format_spec.rb
 - spec/unit/file_format/file_format_api_spec.rb
 - spec/unit/file_format/format_autodetection_spec.rb
@@ -378,4 +381,3 @@ test_files:
 - spec/unit/tracker/timespan_tracker_spec.rb
 - spec/unit/tracker/tracker_api_spec.rb
 - spec/unit/tracker/traffic_tracker_spec.rb
-has_rdoc: