resque_log_error_parser 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01983891b93d909cccf6c77177a2a3b4cbf042f8
-  data.tar.gz: 4d798bdd4a5ca70ab0d0e8d36556c286dd6015f2
+  metadata.gz: bff4ae621b72803b366b033c088893aa448ab954
+  data.tar.gz: 3d111c1ad7f87f0edfdc18c1ce73321cd5dd86e3
 SHA512:
-  metadata.gz: 7096493461a534a1d626f1311336ce0a6894927d74353f0e3e939eb02f375ae8939d22f2a30ddb30f09fc03af8bb1475543fd6ffb76fa89757cf68b14d78902a
-  data.tar.gz: da05e6fd1edccf410696ae8b526431ef838b53fee57c018d7f258db3b8af03841bd4db44c8df11eec657a2b8fd05410b2e68ea1f3df0a12632a26a952d78ed69
+  metadata.gz: 987bde14792ce94f3730c779d1182feff6ac0b49d7ff49b1b2133083081499a6fcc534b69b2bd6c1fafc1cbed05bb958b8293b8068da6670a57ba8a780981725
+  data.tar.gz: c2a876bfd2c2f012405df2be06d78f6443b533167d0fc3639856e797c88d70c94f7a2f412699436e5b3cc86ac596fb3e02451e1e0be02a2bf99f2fc9dae43843

data/.gitignore

@@ -0,0 +1 @@
+pkg/

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.1.0
+
+- By default, include FATAL messages in the filtered log lines
+
 # 1.0.0
 
 - Initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    resque_log_error_parser (0.0.0)
+    resque_log_error_parser (1.0.0)
       resque
 
 GEM
@@ -11,17 +11,17 @@ GEM
     diff-lcs (1.2.4)
     method_source (0.8.2)
     mono_logger (1.1.0)
-    multi_json (1.8.1)
+    multi_json (1.8.2)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.1)
       rack
     redis (3.0.5)
-    redis-namespace (1.3.1)
-      redis (~> 3.0.0)
+    redis-namespace (1.3.2)
+      redis (~> 3.0.4)
     resque (1.25.1)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
@@ -36,7 +36,7 @@ GEM
     rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
-    sinatra (1.4.3)
+    sinatra (1.4.4)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)

data/README.md

@@ -1,26 +1,26 @@
-# Resque Log File Error Parser
+# Resque Log Error Parser
 
 Resque worker that parses log files given filters, and executes a callback of your choice.
 
 ## Install
 
-    gem "resque_log_file_error_parser"
+    gem "resque_log_error_parser"
 
 ## Setup:
 
-    ResqueLogFileErrorParser.queue = :queue_the_worker_should_listen_to
-    ResqueLogFileErrorParser.on_error do |line_in_log_with_error|
+    ResqueLogErrorParser.queue = :queue_the_worker_should_listen_to
+    ResqueLogErrorParser.on_error do |line_in_log_with_error|
       # You can email yourself, or report to PagerDuty like:
       p = Pagerduty.new("key here")
       p.trigger("Error found: #{line_in_log_with_error}")
     end
 
     # If your logs are located in a place other than "log/*.log", then you need to override the log_paths:
-    ResqueLogFileErrorParser.log_paths = ["some/other/*.log"]
+    ResqueLogErrorParser.log_paths = ["some/other/*.log"]
 
 ## Scheduling
 
-ResqueLogFileErrorParser is intended to be run periodically (e.g. every hour) using `resque_scheduler` or `cron`.
+ResqueLogErrorParser is intended to be run periodically (e.g. every hour) using `resque_scheduler` or `cron`.
 
 ## Processing log entries
 

data/lib/resque_log_error_parser.rb

@@ -1,7 +1,7 @@
 module ResqueLogErrorParser
   DEFAULT_LOG_PATHS = ["log/*.log"]
   DEFAULT_LINE_DATE_FORMAT = '%Y-%m-%dT%H'
-  DEFAULT_LINE_FILTER_KEYS = ["ERROR"]
+  DEFAULT_LINE_FILTER_KEYS = ["ERROR", "FATAL"]
 
   def self.queue=(q)
     @queue = q

data/lib/resque_log_error_parser/lines.rb

@@ -2,11 +2,13 @@ module ResqueLogErrorParser
   class Lines < Array
 
     def filter_by(*filters)
-      filters = [filters].flatten
-      filtered_lines = self.dup
-      filters.each do |filter|
-        filtered_lines = filtered_lines.grep(/#{filter}/)
-      end
+      filters = filters.flatten.compact
+      return self if filters.empty?
+
+      filtered_lines = filters.map do |filter|
+        self.grep(/#{filter}/)
+      end.flatten.uniq
+
       self.class.new(filtered_lines)
     end
 

data/lib/resque_log_error_parser/version.rb

@@ -1,3 +1,3 @@
 module ResqueLogErrorParser
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/resque_log_error_parser/worker.rb

@@ -31,12 +31,13 @@ module ResqueLogErrorParser
     end
 
     def self.filters
-      [self.time_filter_regex, ResqueLogErrorParser.line_filter_keys].flatten
+      ResqueLogErrorParser.line_filter_keys.map do |filter_key|
+        /#{self.time_now_filter}(.*)#{filter_key}/
+      end
     end
 
-    def self.time_filter_regex
-      time_filter_str = Time.now.strftime(ResqueLogErrorParser.line_date_format)
-      /#{time_filter_str}/
+    def self.time_now_filter
+      Time.now.strftime(ResqueLogErrorParser.line_date_format)
     end
 
   end

data/spec/fixtures/log/test.log

@@ -1,3 +1,4 @@
 E, [2013-10-05T17:01:04.194981 #28727] ERROR -- : Error line yesterday
-E, [2013-10-06T17:01:04.194981 #28727] ERROR -- : Error line today
+E, [2013-10-06T17:01:04.194982 #28727] ERROR -- : Error line today
+F, [2013-10-06T17:01:04.204983 #21462] FATAL -- : Pusher : error : {"code"=>4201, "message"=>"Pong reply not received"}
 D, [2013-10-06T17:01:04.423205 #28727] DEBUG -- : No error

data/spec/resque_log_error_parser/lines_spec.rb

@@ -4,12 +4,14 @@ describe ResqueLogErrorParser::Lines do
 
   describe "#filter_by" do
     let(:lines) do
-      described_class.new(["hello", "world", "helloworld"])
+      described_class.new(["hello", "world", "helloworld", "should not be included"])
     end
 
-    it "returns a Lines instance filtered by the given strings" do
+    it "returns a Lines instance matching ANY of the given filters" do
       filtered_lines = lines.filter_by("llo", /orld/)
-      expect(filtered_lines.count).to eq(1)
+      expect(filtered_lines.count).to eq(3)
+      expect(filtered_lines).to include("hello")
+      expect(filtered_lines).to include("world")
       expect(filtered_lines).to include("helloworld")
     end
 
@@ -31,6 +33,9 @@ describe ResqueLogErrorParser::Lines do
       it "returns the original" do
         filtered_lines = lines.filter_by([])
         expect(filtered_lines).to eq(lines)
+
+        filtered_lines = lines.filter_by(nil)
+        expect(filtered_lines).to eq(lines)
       end
     end
   end

data/spec/resque_log_error_parser/worker_spec.rb

@@ -28,8 +28,9 @@ describe ResqueLogErrorParser::Worker do
         lines << line
       end
       described_class.perform
-      expect(lines.count).to eq(1)
-      expect(lines).to include("E, [2013-10-06T17:01:04.194981 #28727] ERROR -- : Error line today")
+      expect(lines.count).to eq(2)
+      expect(lines).to include("E, [2013-10-06T17:01:04.194982 #28727] ERROR -- : Error line today")
+      expect(lines).to include("F, [2013-10-06T17:01:04.204983 #21462] FATAL -- : Pusher : error : {\"code\"=>4201, \"message\"=>\"Pong reply not received\"}")
     end
   end
 

data/spec/resque_log_error_parser_spec.rb

@@ -54,8 +54,8 @@ describe ResqueLogErrorParser do
   end
 
   describe ".line_filter_keys" do
-    it "defaults to ['ERROR']" do
-      expect(described_class.line_filter_keys).to eq(['ERROR'])
+    it "defaults to ['ERROR', 'FATAL']" do
+      expect(described_class.line_filter_keys).to eq(['ERROR', 'FATAL'])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque_log_error_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - G5 Search Marketing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -61,6 +61,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock