logworm_amqp 0.8.8 → 0.8.9

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.8.9
+    Cleaned up pushed stats output.
+
 v0.8.8
 	Now retrieve amqp_url remotely for better security.
 

data/Rakefile

@@ -1,5 +1,5 @@
 require 'echoe'
-Echoe.new('logworm_amqp', '0.8.8') do |p|
+Echoe.new('logworm_amqp', '0.8.9') do |p|
   p.description = "logworm logging tool"
   p.url = "http://www.logworm.com"
   p.author = "Pomelo, LLC"

data/lib/base/db.rb

@@ -115,10 +115,11 @@ module Logworm
           resp = db_call(:get, "#{host_with_protocol}/amqp_url")
           @amqp_url = resp["url"]
           @stats_freq = resp["stats_freq"]
-          puts "Found: #{@amqp_url}, #{@stats_freq}"
+          $stderr.puts "logworm server acquired: #{@amqp_url}"
           Minion.amqp_url = @amqp_url
         rescue 
           @last_attempt = Time.now
+          $stderr.puts "logworm cannot connect to server; please wait at least #{RETRY_FREQUENCY} seconds. log entries will be lost"
         end
       end
       !(@amqp_url.nil?)
@@ -129,7 +130,7 @@ module Logworm
          content = payload.to_json
          sig= signature(content, @token_secret )
          Minion.enqueue(queue, {:payload => content, :consumer_key => @token, :signature => sig, 
-                              :env => ENV['RACK_ENV'] || "?", :timestamp => Time.now})
+                                :env => ENV['RACK_ENV'] || "?"})
        end
     end
   
@@ -148,13 +149,16 @@ module Logworm
     end
 
     def push_stats()
-       to_amqp("lw.stats", {:avg => (@total_time / @tock), :max => @amqp_max, :min => @amqp_min, :total => @total_time, :count => @tock})
+       to_amqp("lw.stats", {:avg => (@total_time / @tock), :max => @amqp_max, :min => @amqp_min, 
+                            :total => @total_time, :count => @tock, :sampling_length => (Time.now - @sampling_start) })
+       $stderr.puts "logworm statistics: #{@tock} messages sent in #{Time.now - @sampling_start}. Times: #{(@total_time / @tock) * 1000}/#{@amqp_min * 1000}/#{@amqp_max * 1000} (avg/min/max seconds)"
        reset_stats
     end
     
     def reset_stats()
       @total_time = @tock = @amqp_max = 0
       @amqp_min = MIN_AQMP
+      @sampling_start = Time.now
     end
   
     def batch_log(entries)

data/logworm_amqp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logworm_amqp}
-  s.version = "0.8.8"
+  s.version = "0.8.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pomelo, LLC"]
-  s.date = %q{2010-08-06}
+  s.date = %q{2010-08-08}
   s.description = %q{logworm logging tool}
   s.email = %q{schapira@pomelollc.com}
   s.extra_rdoc_files = ["CHANGELOG", "README.md", "lib/base/config.rb", "lib/base/db.rb", "lib/base/query_builder.rb", "lib/logworm_amqp.rb"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logworm_amqp
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: false
   segments: 
   - 0
   - 8
-  - 8
-  version: 0.8.8
+  - 9
+  version: 0.8.9
 platform: ruby
 authors: 
 - Pomelo, LLC
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 -04:00
+date: 2010-08-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency