logworm_amqp 0.8.5 → 0.8.6

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.8.6
+	Now retrieve amqp_url remotely for better security.
+
 v0.8.5
 	Started logging amqp usage statistics to our servers (randomly) for better QA.
 

data/Rakefile

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

data/lib/base/db.rb

@@ -18,6 +18,10 @@ module Logworm
     
     URL_FORMAT    = /logworm:\/\/([^:]+):([^@]+)@([^\/]+)\/([^\/]+)\/([^\/]+)\//
     # URI: logworm://<consumer_key>:<consumer_secret>@db.logworm.com/<access_token>/<access_token_secret>/
+
+    MIN_AQMP         = 500
+    STATS_FREQ       = 300
+    RETRY_FREQUENCY  = 60
  
     attr_reader :host, :consumer_key, :consumer_secret, :token, :token_secret
       
@@ -27,12 +31,7 @@ module Logworm
       raise ForbiddenAccessException.new("Incorrect URL Format #{url}") unless match and match.size == 6      
       @consumer_key, @consumer_secret, @host, @token, @token_secret = match[1..5]
       @connection = OAuth::AccessToken.new(OAuth::Consumer.new(@consumer_key, @consumer_secret), @token, @token_secret)
-      Minion.amqp_url = "amqp://logworm-producer:4tX.z.rC@pomelo-1.dotcloud.com/"
-      @current_day = Time.now.yday
-      @total_time = 0
-      @tock = 0
-      @amqp_min = 500
-      @amqp_max = 0
+      reset_stats
     end
   
     def self.with_tokens(token, token_secret)
@@ -79,7 +78,7 @@ module Logworm
       DB.make_url(@host, @consumer_key, @consumer_secret, @token, @token_secret)
     end
     
-    def self.example_url
+    def self.example_url()
       self.make_url("db.logworm.com", "Ub5sOstT9w", "GZi0HciTVcoFHEoIZ7", "OzO71hEvWYDmncbf3C", "J7wq4X06MihhZgqDeB")
     end
 
@@ -109,60 +108,57 @@ module Logworm
     def escape(value) 
       CGI.escape(value.to_s).gsub("%7E", '~').gsub("+", "%20") 
     end 
-    
-    def set_minion_url()
-    #updates amqp_url potentially once a day.
-    day_now = Time.now.yday
-    if day_now != @current_day
-      url = nil
-      begin
-              res = db_call(:get, "#{host_with_protocol}/amqp_url")
-              url = res["url"] if res and res["url"]
-      rescue Exception
+        
+    def get_amqp_url()
+      if @amqp_url.nil? and (@last_attempt.nil? or (Time.now - @last_attempt) > RETRY_FREQUENCY)
+        begin
+          @amqp_url = db_call(:get, "#{host_with_protocol}/amqp_url")["url"]
+          Minion.amqp_url = @amqp_url
+        rescue 
+          @last_attempt = Time.now
+        end
       end
-      Minion.amqp_url = url if !url.nil? 
-      @current_day = day_now
-    end
+      !(@amqp_url.nil?)
+    end
+        
+    def to_amqp(queue, payload)
+       if get_amqp_url
+         sig= signature(payload.to_json, @token_secret )
+         Minion.enqueue(queue, {:payload => content, :consumer_key => @token, :signature => sig, 
+                              :env => ENV['RACK_ENV'] || "?", :timestamp => Time.now})
+       end
     end
+  
+    def recording_stats()
+      s = Time.now
+      yield if block_given?
+      record_stats((Time.now - s))
+      push_stats() if (rand(STATS_FREQ) == 1)
+    end 
     
-    def amqp_avg_set(value)
-      #min and max can be the same target value if method is only used once.
-    if  value > @amqp_max
-      @amqp_max = value
-    end
-    if value < @amqp_min
-     @amqp_min = value
-    end
+    def record_stats(value)
+      @tock += 1
+      @total_time += value
+      @amqp_max = value if value > @amqp_max
+      @amqp_min = value if value < @amqp_min
     end
-    
+
     def push_stats()
-      if (rand(300) == 1) #and @tock > 0 --> don't need to worry about this since tock is always incremented at least once before ever using as a divsor 
-         average = @total_time / @tock
-         tstamp = Time.now
-         Minion.enqueue("lw.stats", {:avg => average, :stamp => tstamp, 
-           :max => @amqp_max, :min => @amqp_min, :max => @amqp_max, :total => @total_time  })
-         @total_time = 0
-         @tock = 0
-         @amqp_max = 0
-         @amqp_min = 500
-       end
+       to_amqp("lw.stats", {:avg => (@total_time / @tock), :max => @amqp_max, :min => @amqp_min, :max => @amqp_max})
+       reset_stats
     end
     
+    def reset_stats()
+      @total_time = @tock = @amqp_max = 0
+      @amqp_min = MIN_AQMP
+    end
+  
     def batch_log(entries)
-      #db_call(:post, "#{host_with_protocol}/log", {:entries => $lr_queue.to_json})
-      content = $lr_queue.to_json
-      sig= signature(content, @token_secret )
-      set_minion_url()
-      s = Time.now
-      Minion.enqueue("lw.logging", {:entries => content, :consumer_key => @token, :signature => sig }) 
-      elapse = (Time.now - s)  
-      @total_time += elapse
-      @tock += 1
-      amqp_avg_set(elapse)
-      push_stats()
+      recording_stats do
+        to_amqp("lw.logging", {:entries => entries.to_json})
+      end
     end
 
-
   private
     def db_call(method, uri, params = {})
       begin

data/logworm_amqp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logworm_amqp}
-  s.version = "0.8.5"
+  s.version = "0.8.6"
 
   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-04}
+  s.date = %q{2010-08-06}
   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: 53
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 8
-  - 5
-  version: 0.8.5
+  - 6
+  version: 0.8.6
 platform: ruby
 authors: 
 - Pomelo, LLC
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-04 00:00:00 -04:00
+date: 2010-08-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency