grok 0.0.4 → 0.0.5

data/README.rdoc

@@ -59,6 +59,19 @@ weeks (w), days (d), hours (h), minutes (m) and seconds (s).  For example
   '1d2h3s' => 1 day, 2 hours and 3 seconds
   '2y3m' => 2 years and 3 minutes
 
+=== Ignoring log events
+If you want grok to ignore certain log events, you can simply pass a regexp to the ignore function.
+
+  ignore /regexp/
+
+This is particularly useful if you have a catch-all event in your script somewhere
+
+  ignore /kernel: imklog [\d\.]+, log source = \/proc\/kmsg started/
+
+  on /(.*) do |line|
+    #foo
+  end
+
 === Other events
 ==== Exit
 You can also define event handlers to run when your script exits (for the
@@ -81,6 +94,20 @@ input.
 
 You can define as many of these event handlers as you'd like
 
+==== SIGUSR1 and SIGUSR2
+You can define event handlers to run whenever your grok process receives 
+SIGUSR1 or SIGUSR2 as well.
+
+  on :usr1 do
+    puts "SIGUSR1 received"
+  end
+
+  on :usr2 do
+    puts "SIGUSR2 received"
+  end
+
+You can define as many of these event handlers as you'd like.
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/grok.rb

@@ -19,7 +19,13 @@ def start(&block)
   $watcher.on_start(&block)
 end
 
+def ignore(match)
+  $watcher.ignore(match)
+end
+
 trap "SIGINT", proc { $watcher.stop }
+trap "SIGUSR1", proc { $watcher.usr1 }
+trap "SIGUSR2", proc { $watcher.usr2 }
 
 at_exit do
   unless defined?(Test::Unit)

data/lib/grok/watcher.rb

@@ -11,18 +11,29 @@ module Grok
       @events = {}
       @event_log = {}
       @config = Config.new(nil, 10, 0, nil)
-
-      #instance_eval(&b) if block_given?
+      @catchable_signals = [:usr1, :usr2]
     end
 
     def configure(&b)
       b.call(@config)
     end
 
-    def on(match, opts={}, &block)
+    def ignore(match)
       match = match.to_s if match.is_a? Integer
-      within = opts[:within] ? Grok.parse_time_string(opts[:within]) : nil
-      (@events[:log] ||= []) << [Regexp.new(match), block, opts[:times], within]
+      (@events[:ignore] ||= []) << [Regexp.new(match)]
+    end
+
+    def on(match, opts={}, &block)
+      if match.is_a? Symbol
+        if @catchable_signals.include? match
+          (@events[match] ||= []) << block
+          puts @events
+        end
+      else 
+        match = match.to_s if match.is_a? Integer
+        within = opts[:within] ? Grok.parse_time_string(opts[:within]) : nil
+        (@events[:log] ||= []) << [Regexp.new(match), block, opts[:times], within]
+      end
     end
 
     def on_exit(&block)
@@ -58,6 +69,14 @@ module Grok
       dispatch(:exit)
     end
 
+    def usr1
+      dispatch(:usr1)
+    end
+
+    def usr2
+      dispatch(:usr2)
+    end
+
   private
     def find(type, log)
       if events = @events[type]
@@ -90,6 +109,10 @@ module Grok
 
       if event == :start
         @events[:start].each { |block| invoke block }
+      elsif @catchable_signals.include? event
+        @events[event].each { |block| invoke block }
+      elsif handler = find(:ignore, log)
+        # do nothing!
       elsif handler = find(event, log)
         regexp, block, times, within = *handler
         self.match = log.match(regexp).captures

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: grok
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Tim Sharpe
@@ -9,29 +14,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 +11:00
+date: 2010-04-14 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: file-tail
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: A more featureful replacement for SEC (Simple Event Correlator) in Ruby.
 email: tim@sharpe.id.au
 executables: []
@@ -68,18 +77,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A ruby log event correlator