logtrend 0.6.20101204165035 → 0.7.20101204170528

data/lib/logtrend.rb

@@ -4,56 +4,55 @@ require 'eventmachine-tail'
 require 'rrd'
 require 'logger'
 
-class LogTrend
-  attr_accessor :graphs
-  attr_accessor :graphs_dir, :rrd_dir
+module LogTrend
+  class Base
+    attr_accessor :graphs_dir, :rrd_dir
   
-  def initialize
-    @graphs_dir = '.'
-    @rrd_dir = '.'
-    @trends = {}
-    @graphs = []
-    @logger = Logger.new(STDERR)
-    @logger.level = ($DEBUG and Logger::DEBUG or Logger::WARN)
-  end
+    def initialize
+      @graphs_dir = '.'
+      @rrd_dir = '.'
+      @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|
-      counters[k] = 0
+    def reset_counters
+      counters = {}
+      @trends.keys.each do |k|
+        counters[k] = 0
+      end
+      counters
     end
-    counters
-  end
   
-  def update_rrd(name, value)
-    file_name = File.join(@rrd_dir,"#{name}.rrd")
-    rrd = RRD::Base.new(file_name)
-    if !File.exists?(file_name)
-      rrd.create :start => Time.now - 10.seconds, :step => 1.minutes do
-        datasource "#{name}_count", :type => :gauge, :heartbeat => 5.minutes, :min => 0, :max => :unlimited
-        archive :average, :every => 5.minutes, :during => 1.year
+    def update_rrd(name, value)
+      file_name = File.join(@rrd_dir,"#{name}.rrd")
+      rrd = RRD::Base.new(file_name)
+      if !File.exists?(file_name)
+        rrd.create :start => Time.now - 10.seconds, :step => 1.minutes do
+          datasource "#{name}_count", :type => :gauge, :heartbeat => 5.minutes, :min => 0, :max => :unlimited
+          archive :average, :every => 5.minutes, :during => 1.year
+        end
       end
+      rrd.update Time.now, value
     end
-    rrd.update Time.now, value
-  end
   
-  def build_graph(graph)
-    rrd_dir = @rrd_dir
-    RRD.graph File.join(@graphs_dir,"#{graph.name}.png"), :title => graph.name, :width => 800, :height => 250, :color => ["FONT#000000", "BACK#FFFFFF"] do
-      graph.points.each do |point|
-        if point.style == :line
-          line File.join(rrd_dir,"#{point.name}.rrd"), "#{point.name}_count" => :average, :color => point.color, :label => point.name.to_s
-        elsif point.style == :area
-          area File.join(rrd_dir,"#{point.name}.rrd"), "#{point.name}_count" => :average, :color => point.color, :label => point.name.to_s         
+    def build_graph(graph)
+      rrd_dir = @rrd_dir
+      RRD.graph File.join(@graphs_dir,"#{graph.name}.png"), :title => graph.name, :width => 800, :height => 250, :color => ["FONT#000000", "BACK#FFFFFF"] do
+        graph.points.each do |point|
+          if point.style == :line
+            line File.join(rrd_dir,"#{point.name}.rrd"), "#{point.name}_count" => :average, :color => point.color, :label => point.name.to_s
+          elsif point.style == :area
+            area File.join(rrd_dir,"#{point.name}.rrd"), "#{point.name}_count" => :average, :color => point.color, :label => point.name.to_s         
+          end
         end
       end
     end
-  end
   
-  def start(logfile)
-    begin
+    def run(logfile)
       counters = reset_counters
-      
+    
       EventMachine.run do       
         EventMachine::add_periodic_timer(1.minute) do
           @logger.debug "#{Time.now} #{counters.inspect}"
@@ -61,7 +60,7 @@ class LogTrend
           @graphs.each {|graph| build_graph(graph)}
           counters = reset_counters
         end
-        
+      
         EventMachine::file_tail(logfile) do |filetail, line|
           @trends.each do |name, block|
             counters[name] += 1 if block.call(line)
@@ -69,43 +68,41 @@ class LogTrend
           @logger.debug counters.inspect
         end
       end
-    rescue Interrupt
-      # hit ctrl-c
-    end    
-  end
+    end
   
-  def add_trend(name, &block)
-    throw "D'oh! No block." unless block_given?
-    @trends[name] = block
-  end
+    def add_trend(name, &block)
+      throw "D'oh! No block." unless block_given?
+      @trends[name] = block
+    end
   
-  def add_graph(name, &block)
-    throw "D'oh! No block." unless block_given?
-    graph = Graph.new(name)
-    yield graph
-    @graphs << graph
-  end
+    def add_graph(name, &block)
+      throw "D'oh! No block." unless block_given?
+      graph = Graph.new(name)
+      yield graph
+      @graphs << graph
+    end
   
-  def self.start(logfile, &block)
-    l = LogTrend.new
-    yield l if block
-    l.start logfile
+    def self.run(logfile, &block)
+      l = Base.new
+      yield l if block
+      l.run logfile
+    end
   end
-end
 
-class Graph
+  class Graph
   
-  attr_reader :points
-  attr_reader :name
+    attr_reader :points
+    attr_reader :name
   
-  def initialize(name)
-    @name = name
-    @points = []
-  end
+    def initialize(name)
+      @name = name
+      @points = []
+    end
   
-  def add_point(style,name,color)
-    @points << GraphPoint.new(style, name, color)    
+    def add_point(style,name,color)
+      @points << GraphPoint.new(style, name, color)    
+    end
   end
-end
 
-GraphPoint = Struct.new(:style, :name, :color)
+  GraphPoint = Struct.new(:style, :name, :color)
+end

data/samples/example.rb

@@ -8,15 +8,18 @@ FileUtils.touch('test.log')
 Dir.mkdir('/tmp/rrd') if !File.exists?('/tmp/rrd')
 Dir.mkdir('/tmp/graphs') if !File.exists?('/tmp/graphs')
 
-LogTrend.start("test.log") do |l|
+LogTrend::Base.run("test.log") do |l|
   
+  # set new locations for our graphs and rrds.  defaults to '.'
   l.rrd_dir = '/tmp/rrd'
   l.graphs_dir = '/tmp/graphs'
   
+  # add some things to trend.  An RRD is built for each one of these items.
   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/}
   
+  # build a graph showing requests per minute
   l.add_graph(:requests_per_minute) do |g|
     g.add_point :area, :total, "#333333"
     g.add_point :line, :fbod, "#0066cc"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logtrend
 version: !ruby/object:Gem::Version 
-  hash: 40202408330065
+  hash: 40202408341059
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 20101204165035
-  version: 0.6.20101204165035
+  - 7
+  - 20101204170528
+  version: 0.7.20101204170528
 platform: ruby
 authors: 
 - Michael Gorsuch