logworm_client 0.3.2 → 0.4.0

data/CHANGELOG

@@ -1,4 +1,9 @@
-v0.3.2 added lw_log method
+v0.4.0 Added support for running on Rails!
+    To use, add config.gem ‘logworm_client’ to environment.rb
+    Then you can configure in ApplicationController, via logs_requests [:short | :long]+
+    Works from views, models, or controllers.
+    
+v0.3.2 added lw_log method --fixed small issue
 
 v0.3.1 added lw_log method
 

data/Manifest

@@ -8,6 +8,7 @@ bin/lw-tail
 lib/logworm_client.rb
 lib/logworm_client/logger.rb
 lib/logworm_client/rack.rb
+lib/logworm_client/rails.rb
 lib/logworm_utils.rb
 lib/logworm_utils/compute.rb
 lib/logworm_utils/heroku.rb

data/Rakefile

@@ -1,5 +1,5 @@
 require 'echoe'
-Echoe.new('logworm_client', '0.3.2') do |p|
+Echoe.new('logworm_client', '0.4.0') do |p|
   p.description = "logworm client utilities"
   p.url = "http://www.logworm.com"
   p.author = "Pomelo, LLC"

data/bin/lw-tail

@@ -4,6 +4,12 @@ require 'rubygems'
 require 'logworm_utils'
 require 'optparse'
 
+def help(option_parser)
+  puts option_parser.help
+  puts
+  LogwormTail.list
+end
+
 options = {
   :limit => 200,
   :loop => false,
@@ -54,7 +60,7 @@ option_parser = OptionParser.new do |opts|
   end
   
   opts.on( '-h', '--help', 'Display this screen' ) do
-    puts option_parser.help
+    help option_parser
     exit(1)
   end
   
@@ -64,7 +70,7 @@ end
 option_parser.parse!
 table = ARGV.pop
 if !table
-  puts option_parser.help
+  help option_parser
   exit(1)
 end
 table.strip!

data/lib/logworm_client.rb

@@ -2,6 +2,7 @@ require 'logworm'
 
 require 'logworm_client/logger'
 require 'logworm_client/rack'
+require 'logworm_client/rails'
 
 def lw_log (logname, values)
   Logworm::Logger.log(logname, values)

data/lib/logworm_client/rails.rb

@@ -0,0 +1,70 @@
+###
+# Extemds ActionController::Base and aliases the process method, to wrap it with the standard logworm request cycle
+#
+# By default it will automatically log web requests (in a short format) into web_log
+# Can also log in long format if specified.
+#
+# Configuration
+#  In ApplicationController, add
+#    logs_requests :short, :long 
+#    logs_requests :long 
+#    logs_requests :short, :long 
+###
+if defined?(ActionController)
+
+  ActionController::Base.class_eval do
+    @@log_requests_short = true
+    @@log_requests_long  = false
+    
+    def self.logs_requests(*options)
+      @@log_requests_short = (options.include?(:short) or options.include?("short"))
+      @@log_requests_long  = (options.include?(:long)  or options.include?("long"))
+    end
+    
+    def process_with_logworm_log(request, response, method = :perform_action, *arguments)
+      startTime = Time.now 
+      Logworm::Logger.start_cycle
+      begin
+        response = process_without_logworm_log(request, response, method, *arguments)
+        appTime = (Time.now - startTime) 
+      ensure
+        env = request.env
+        status = response.status[0..2]
+
+        Logworm::Logger.log(:web_log_long, 
+                             {:summary => "#{env['REQUEST_METHOD']} #{env['REQUEST_URI']} - #{status} #{appTime}", 
+                               :request => env_to_log(env).merge({:input => request.request_parameters}),
+                               :response => {:status => status, :headers => response.headers}, 
+                               :profiling => appTime}) if @@log_requests_long 
+        Logworm::Logger.log(:web_log, 
+                             {:summary => "#{env['REQUEST_METHOD']} #{env['REQUEST_URI']} - #{status} #{appTime}", 
+                              :request_path => env['REQUEST_URI'], :request_ip => env['REMOTE_ADDR'],
+                              :request_method => env['REQUEST_METHOD'],
+                              :input => request.request_parameters,
+                              :response_status => status, 
+                              :profiling => appTime}) if @@log_requests_short
+        begin 
+          Timeout::timeout(1) {
+             Logworm::Logger.flush  # Flushes only if there are any entries. Times out after a second 
+          } 
+        rescue Exception => e 
+          # Ignore --nothing we can do 
+          # The list of logs may (and most likely will) be preserved for the next request
+          logger.error("logworm call failed: #{e}") if logger
+        end
+        return response
+      end
+    end
+    
+    def env_to_log(env) 
+      to_log = {} 
+      env.each do |k,v| 
+        to_log[k.to_s.downcase.to_sym] = v unless (k.to_s =~ /rack/i or k.to_s =~ /\./i) 
+      end 
+    end 
+    
+    alias_method_chain :process, :logworm_log
+  end
+
+end
+

data/lib/logworm_utils/tail.rb

@@ -12,6 +12,24 @@ class LogwormTail
       end
     end
 
+    def self.list
+      begin
+        @db     = Logworm::DB.new(false)
+        @tables = @db.tables
+        if @tables and @tables.size > 0
+          puts "The following are the tables that you've created thus far:"
+          @tables.sort {|x,y| x["tablename"] <=> y["tablename"]}.each do |t| 
+            puts "\t - #{t["tablename"]}, #{t["rows"]} rows, last updated on #{date_time(t["last_write"])}"
+          end
+        else
+          puts "You haven't recorded any data yet."
+        end
+      rescue Exception => e
+        $stderr.puts "Error: #{e}"
+        exit(-1)
+      end
+    end
+    
     def run
       # Create a resource for the query
       begin
@@ -56,6 +74,10 @@ class LogwormTail
 
   private
 
+    def self.date_time(val)
+      val.gsub(/T/, ' @ ').gsub(/Z/, ' GMT')
+    end
+    
     def print_rows(rows, last)
       last = "" if last.nil?
       rows.reverse.each do |r|
@@ -64,7 +86,7 @@ class LogwormTail
           last = r["_ts"]
           r.delete("_id") unless @options[:fields].include?("_id")
           r.delete("_ts") unless @options[:fields].include?("_ts")
-          puts "#{last.gsub(/T/, ' @ ').gsub(/Z/, ' GMT')} ==> "
+          puts "#{LogwormTail.date_time(last)} ==> "
           print_row(r)
         end
       end
@@ -73,7 +95,7 @@ class LogwormTail
 
     def print_row(r)
       if @options[:flat]
-        r.keys.sort.map {|k| "#{k}: #{r[k].inspect}"}.join(', ')
+        puts "\t" + r.keys.sort.map {|k| "#{k}: #{r[k].inspect}"}.join(', ')
       else
         r.keys.sort.each do |k|
           puts "\t#{k}: #{r[k].inspect}"

data/logworm_client.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logworm_client}
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pomelo, LLC"]
-  s.date = %q{2010-03-02}
+  s.date = %q{2010-03-04}
   s.description = %q{logworm client utilities}
   s.email = %q{schapira@pomelollc.com}
   s.executables = ["lw-compute", "lw-heroku", "lw-tail"]
-  s.extra_rdoc_files = ["CHANGELOG", "README", "bin/lw-compute", "bin/lw-heroku", "bin/lw-tail", "lib/logworm_client.rb", "lib/logworm_client/logger.rb", "lib/logworm_client/rack.rb", "lib/logworm_utils.rb", "lib/logworm_utils/compute.rb", "lib/logworm_utils/heroku.rb", "lib/logworm_utils/tail.rb"]
-  s.files = ["CHANGELOG", "Manifest", "README", "Rakefile", "bin/lw-compute", "bin/lw-heroku", "bin/lw-tail", "lib/logworm_client.rb", "lib/logworm_client/logger.rb", "lib/logworm_client/rack.rb", "lib/logworm_utils.rb", "lib/logworm_utils/compute.rb", "lib/logworm_utils/heroku.rb", "lib/logworm_utils/tail.rb", "logworm_client.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "README", "bin/lw-compute", "bin/lw-heroku", "bin/lw-tail", "lib/logworm_client.rb", "lib/logworm_client/logger.rb", "lib/logworm_client/rack.rb", "lib/logworm_client/rails.rb", "lib/logworm_utils.rb", "lib/logworm_utils/compute.rb", "lib/logworm_utils/heroku.rb", "lib/logworm_utils/tail.rb"]
+  s.files = ["CHANGELOG", "Manifest", "README", "Rakefile", "bin/lw-compute", "bin/lw-heroku", "bin/lw-tail", "lib/logworm_client.rb", "lib/logworm_client/logger.rb", "lib/logworm_client/rack.rb", "lib/logworm_client/rails.rb", "lib/logworm_utils.rb", "lib/logworm_utils/compute.rb", "lib/logworm_utils/heroku.rb", "lib/logworm_utils/tail.rb", "logworm_client.gemspec"]
   s.homepage = %q{http://www.logworm.com}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Logworm_client", "--main", "README"]
   s.require_paths = ["lib"]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Pomelo, LLC
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 -05:00
+date: 2010-03-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ extra_rdoc_files:
 - lib/logworm_client.rb
 - lib/logworm_client/logger.rb
 - lib/logworm_client/rack.rb
+- lib/logworm_client/rails.rb
 - lib/logworm_utils.rb
 - lib/logworm_utils/compute.rb
 - lib/logworm_utils/heroku.rb
@@ -97,6 +98,7 @@ files:
 - lib/logworm_client.rb
 - lib/logworm_client/logger.rb
 - lib/logworm_client/rack.rb
+- lib/logworm_client/rails.rb
 - lib/logworm_utils.rb
 - lib/logworm_utils/compute.rb
 - lib/logworm_utils/heroku.rb