lognotifier 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c35eacd8647646f1b1476934575254f39cbd5613
-  data.tar.gz: 1dfe2b4c94ce3537157b81b563165e6828e9de5a
+  metadata.gz: 2f9f4a3327765327d119256598ade5ecd51d1132
+  data.tar.gz: ccd651ccf1e69da2cd0a0ac9078e31711a8645fd
 SHA512:
-  metadata.gz: 4a1e0f8a50e45ec87236a1c59c0ae3f89af1df88fbe7162c302b2031b77aa2e9cf61db6c64105758f2a27c591fa91fb6cf3c58ddccb6ccf7a9f99f9be151279d
-  data.tar.gz: d08fce50463aad57f9112ba4997e92acfef409c50eabaec6212b9183bfb37a939f757fd540c3470543d24214d5326d2235911ac13b7bd87223cf60a2b1b782de
+  metadata.gz: 3af867267545bd579ddb121a071c126b087c8c0d7e959617fc60ae150c14000eeb740c1d11af543dd4024df95a54941480ea112bbd58b62f0003d64aa5580930
+  data.tar.gz: d423343495bcef574eb9c2ec8da6c51cbba7859da7013caeeb39a5370e80a8c526d0d83b61a2a606e8232f685d7a591a5aa1e801f4131e0e51dd23ce41c73c40

data/lib/lognotifier/application.rb

@@ -1,18 +1,15 @@
 module Lognotifier
-
   class Application
-
-    CONFIG_FILE = "/etc/lognotifier.yaml"
+    CONFIG_FILE = '/etc/lognotifier.yaml'
     @config = nil
     @logger = nil
 
     def initialize
-
       # Load configuration:
       begin
-        @config = YAML::load(File.read CONFIG_FILE)
+        @config = YAML.load(File.read CONFIG_FILE)
       rescue => e
-        puts "Error at opening config file, error was:"
+        puts 'Error at opening config file, error was:'
         puts e.message
         exit 1
       end
@@ -21,13 +18,11 @@ module Lognotifier
       @logger = Logger.new @config['logfile']
 
       # Main exec loop
-      self.run
-      
+      run
     end
 
     def run
-
-      @logger.info "Starting lognotifierd"
+      @logger.info 'Starting lognotifierd'
 
       threads = []
       @config['pagerduty'].each do |conf|
@@ -50,26 +45,37 @@ module Lognotifier
             @logger.error "ERROR WAS: #{e.message}"
             Thread.exit
           end
-          file.seek(0,IO::SEEK_END)
-          queue = INotify::Notifier.new  
+
+          # Seek to the end of the file and watch for changes
+          file.seek(0, IO::SEEK_END)
+          queue = INotify::Notifier.new
+
+          # previous to nil to record the previous line
+          previous = nil
+
+          # Watch for modified actions, read the content and alert if match
+          # When alerting also send the previous line if available
           queue.watch(filename, :modify) do
             content = file.read
             config['patterns'].each do |pattern|
-              if content.match(/#{pattern["regex"]}/)
-                begin
-                  pagerduty.trigger("#{pattern["prefix"]} #{content}")
-                  @logger.info("ALERT TRIGGERD: #{pattern["prefix"]} #{content}" )
-                rescue => e
-                  @logger.error("FAILED TO SEND ALERT: #{pattern["prefix"]} #{content}" )
-                  @logger.error("Error: #{e.message.to_s}" )
-                end
+              next unless content.match(/#{pattern["regex"]}/)
+              message = ''
+              message += previous.chomp + ' | ' unless previous.nil? || previous == content
+              message += content.chomp
+              begin
+                pagerduty.trigger("#{pattern['prefix']} #{message}")
+                @logger.info("ALERT TRIGGERD - #{pattern['prefix']}: #{message}")
+              rescue => e
+                @logger.error("FAILED TO SEND ALERT: #{pattern['prefix']} #{message}")
+                @logger.error("Error: #{e.message}")
               end
             end
+            previous = content
           end
-          queue.run 
+          queue.run
         end
       end
-      threads.each {|t| t.join}
+      threads.each(&:join)
     end
   end
 end

data/lib/lognotifier/version.rb

@@ -1,3 +1,3 @@
 module Lognotifier
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lognotifier
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Parse logs and notify to pagerduty on patter match