grok 0.0.0 → 0.0.1

data/README.rdoc

@@ -23,18 +23,18 @@ There's only a few configuration parameters for Grok at this stage
 * replay: The number of lines to read from the bottom of the file on startup
 
 === Responding to log events
-At it's most basic, you can simply get Grok to print a message as it
+At it's most basic, you can simply get Grok to print out each message as it
 receives them (pretty pointless)
-  on :log do
-    puts "I just got a log message"
+  on /(.*)/ do |line|
+    puts line
   end
 
 Lets try something a bit more useful though.  Lets say I want to know every
 time there's an SSH authenitcation failure.  For that, we can make use of the
 RegExp functionality in the event handlers
 
-  on :log, /sshd\[\d+\]: Failed password for ([\d\w]+) from ([\d\.]+)/ do |username, ip|
-    puts "SSH authentication failure for #{username} from #{ip}
+  on /sshd\[\d+\]: Failed password for ([\d\w]+) from ([\d\.]+)/ do |username, ip|
+    puts "SSH authentication failure for #{username} from #{ip}"
   end
 
 This is a bit better.  You could go further to have it automatically block the 

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/examples/ssh_sentry.rb

@@ -6,6 +6,6 @@ configure do |c|
   c.replay = 0
 end
 
-on :log, /Failed password for root from ([\d\.]+)/ do |ip|
+on /Failed password for root from ([\d\.]+)/ do |ip|
   ret = `/sbin/iptables -I INPUT --source #{ip} -j REJECT`
 end

data/lib/grok.rb

@@ -2,14 +2,14 @@ require 'grok/watcher'
 
 $watcher = Grok::Watcher.new
 
-%w(configure on).each do |method|
-  eval(<<-EOF)
-    def #{method}(*args, &block)
-      $watcher.#{method}(*args, &block)
-    end
-  EOF
+def configure(*args, &block)
+  $watcher.configure(*args, &block)
 end
 
+def on(match, opts={}, &block)
+  $watcher.on(match, opts, &block)
+end
+  
 at_exit do
   unless defined?(Test::Unit)
     raise $! if $!

data/lib/grok/watcher.rb

@@ -18,19 +18,12 @@ module Grok
       b.call(@config)
     end
 
-    def on(event, match=//, &block)
+    def on(match, opts={}, &block)
+      event = :log
       match = match.to_s if match.is_a? Integer
       (@events[event] ||= []) << [Regexp.new(match), block]
     end
 
-    def dispatch(event, log)
-      if handler = find(event, log)
-        regexp, block = *handler
-        self.match = log.match(regexp).captures
-        invoke block
-      end
-    end
-
     def start
       File.open(@config.file) do |log|
         log.extend(File::Tail)
@@ -65,5 +58,13 @@ module Grok
         __grok_event_handler(*bargs)
       }
     end
+
+    def dispatch(event, log)
+      if handler = find(event, log)
+        regexp, block = *handler
+        self.match = log.match(regexp).captures
+        invoke block
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grok
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Tim Sharpe