logworm_client 0.5.5 → 0.6.0

data/CHANGELOG

@@ -1,5 +1,11 @@
+v0.6.0 
+    Add support for querying API: lw_query
+    
+v0.5.6
+    log HEROKU_QUEUE as an integer value
+    
 v0.5.5
-    Added default logging of HEROKU_QUEUE
+    Added default logging of HEROKU_QUEUE   
 
 v0.5.4
     Removed obsolete lw-heroku application

data/Rakefile

@@ -1,10 +1,10 @@
 require 'echoe'
-Echoe.new('logworm_client', '0.5.5') do |p|
+Echoe.new('logworm_client', '0.6.0') do |p|
   p.description = "logworm client utilities"
   p.url = "http://www.logworm.com"
   p.author = "Pomelo, LLC"
   p.email  = "schapira@pomelollc.com"
   p.ignore_pattern = ["tmp/*", "script/*"]
-  p.development_dependencies = ["logworm", "json"]
-  p.runtime_dependencies = ["logworm", "json"]
+  p.development_dependencies = ["logworm >=0.7.5", "json"]
+  p.runtime_dependencies = ["logworm >=0.7.5", "json"]
 end

data/lib/logworm_client/rack.rb

@@ -16,6 +16,7 @@ module Logworm
       Logger.start_cycle
       status, headers, body = @app.call(env) 
       appTime = (Time.now - startTime) 
+      queue_size = env['HTTP_X_HEROKU_QUEUE_DEPTH'] ? env['HTTP_X_HEROKU_QUEUE_DEPTH'].to_i : -1
       Logger.log(:web_log_long, {:summary => "#{env['REQUEST_METHOD']} #{env['REQUEST_URI']} - #{status} #{appTime}", 
                              :request => env_to_log(env), 
                              :response => {:status => status, :headers => headers}, 
@@ -25,7 +26,7 @@ module Logworm
                             :request_method => env['REQUEST_METHOD'], :input => collect_input(env),
                             :response_status => status, 
                             :profiling => appTime,
-                            :queue_size => env['HTTP_X_HEROKU_QUEUE_DEPTH'] || '-1'}) if @log_requests_short
+                            :queue_size => queue_size}) if @log_requests_short
       begin 
         Timeout::timeout(1) { 
           sent = 0 

data/lib/logworm_client/rails.rb

@@ -34,13 +34,13 @@ if defined?(ActionController)
       ensure
         env = request.env
         status = response.status[0..2]
-
+        queue_size = env['HTTP_X_HEROKU_QUEUE_DEPTH'] ? env['HTTP_X_HEROKU_QUEUE_DEPTH'].to_i : -1
         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,
-                               :queue_size => env['HTTP_X_HEROKU_QUEUE_DEPTH'] || '-1'}) if @@log_requests_long 
+                               :queue_size => queue_size}) 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'],

data/lib/logworm_client.rb

@@ -6,4 +6,25 @@ require 'logworm_client/rails'
 
 def lw_log (logname, values)
   Logworm::Logger.log(logname, values)
-end
+end
+
+###
+# Perform a query against the logworm server
+# 
+# Returns Hash with
+#  id              ==> id of the query
+#  query_url       ==> URL to GET information about the query
+#  results_url     ==> URL to GET the results for the query
+#  created         ==> First creation of the query
+#  updated         ==> most recent update of the query and/or its results
+#  execution_time  ==> time in ms to run the query
+#  results         ==> array of hashmaps. Each element corresponds to a log entry, with its fields
+#
+# raises Logworm::DatabaseException, Logworm::ForbiddenAccessException, Logworm::InvalidQueryException
+###
+def lw_query(table, query) 
+  db = Logworm::DB.from_config                                          # Establish connection to DB
+  query = Logworm::QueryBuilder.new(query).to_json if query.is_a? Hash  # Turn query into proper JSON string
+  query_data = db.query(table, query)                                   # POST to create query
+  db.results(query_data["results_uri"])                                 # GET from query's results uri
+end

data/logworm_client.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logworm_client}
-  s.version = "0.5.5"
+  s.version = "0.6.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-04-07}
+  s.date = %q{2010-04-22}
   s.description = %q{logworm client utilities}
   s.email = %q{schapira@pomelollc.com}
   s.executables = ["lw-compute", "lw-tail"]
@@ -24,20 +24,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<logworm>, [">= 0"])
+      s.add_runtime_dependency(%q<logworm>, [">= 0.7.5"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<logworm>, [">= 0"])
+      s.add_development_dependency(%q<logworm>, [">= 0.7.5"])
       s.add_development_dependency(%q<json>, [">= 0"])
     else
-      s.add_dependency(%q<logworm>, [">= 0"])
+      s.add_dependency(%q<logworm>, [">= 0.7.5"])
       s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<logworm>, [">= 0"])
+      s.add_dependency(%q<logworm>, [">= 0.7.5"])
       s.add_dependency(%q<json>, [">= 0"])
     end
   else
-    s.add_dependency(%q<logworm>, [">= 0"])
+    s.add_dependency(%q<logworm>, [">= 0.7.5"])
     s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<logworm>, [">= 0"])
+    s.add_dependency(%q<logworm>, [">= 0.7.5"])
     s.add_dependency(%q<json>, [">= 0"])
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 5
-  version: 0.5.5
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Pomelo, LLC
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -04:00
+date: 2010-04-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 7
+        - 5
+        version: 0.7.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -50,7 +52,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 7
+        - 5
+        version: 0.7.5
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency