logtrend 0.1.20101204135642 → 0.2.20101204144415

data/lib/logtrend.rb

@@ -5,19 +5,18 @@ require 'rrd'
 require 'logger'
 
 class LogTrend
-  attr_accessor :trends
   attr_accessor :graphs
   
   def initialize
-    trends = {}
-    graphs = {}
+    @trends = {}
+    @graphs = {}
     @logger = Logger.new(STDERR)
     @logger.level = ($DEBUG and Logger::DEBUG or Logger::WARN)
   end
   
   def reset_counters
     counters = {}
-    trends.keys.each do |k|
+    @trends.keys.each do |k|
       counters[k] = 0
     end
     counters
@@ -58,9 +57,10 @@ class LogTrend
         end
         
         EventMachine::file_tail(logfile) do |filetail, line|
-          trends.each do |name, regex|
-            counters[name] += 1 if line.match(regex)
+          @trends.each do |name, block|
+            counters[name] += 1 if block.call(line)
           end
+          @logger.debug counters.inspect
         end
       end
     rescue Interrupt
@@ -68,6 +68,11 @@ class LogTrend
     end    
   end
   
+  def add_trend(name, &block)
+    throw "D'oh! No block." unless block_given?
+    @trends[name] = block
+  end
+  
   def self.start(logfile, rrd_dir, graphs_dir, &block)
     l = LogTrend.new
     yield l if block

data/samples/example.rb

@@ -9,11 +9,10 @@ Dir.mkdir('/tmp/rrd') if !File.exists?('/tmp/rrd')
 Dir.mkdir('/tmp/graphs') if !File.exists?('/tmp/graphs')
 
 LogTrend.start('test.log', "/tmp/rrd", "/tmp/graphs") do |l|
-  l.trends = {
-    :total => /.*/,
-    :fbod => /fogbugz.com/,
-    :kod => /kilnhg.com/
-  }
+  
+  l.add_trend(:total) {|line| line.match /.*/}
+  l.add_trend(:fbod) {|line| line.match /fogbugz.com/}
+  l.add_trend(:kod) {|line| line.match /kilnhg.com/}
   
   l.graphs = {
     "requests_per_minute" => {

data/samples/test.log

@@ -0,0 +1,19 @@
+test
+test
+test
+test
+test
+test
+test
+test
+test
+test
+test
+test
+test
+test
+fogbugz.com
+fogbugz.com
+fogbugz.com
+fogbugz.com
+kilnhg.com

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logtrend
 version: !ruby/object:Gem::Version 
-  hash: 40202408271279
+  hash: 40202408288809
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 20101204135642
-  version: 0.1.20101204135642
+  - 2
+  - 20101204144415
+  version: 0.2.20101204144415
 platform: ruby
 authors: 
 - Michael Gorsuch
@@ -71,6 +71,7 @@ extra_rdoc_files: []
 files: 
 - lib/logtrend.rb
 - samples/example.rb
+- samples/test.log
 has_rdoc: true
 homepage: https://github.com/gorsuch/logtrend
 licenses: []