lpxc 0.0.7 → 0.0.8

data/lib/lpxc.rb

@@ -28,6 +28,27 @@ class LogMsgQueue
   end
 end
 
+# Like SizedQueue, but drops instead of blocking. Pass one of these in
+# as :request_queue if you would prefer loss to slowing down in cases
+# of back-pressure.
+class DroppingSizedQueue < SizedQueue
+  # Returns true/false depending on whether the queue is full or not
+  def push(obj)
+    @mutex.synchronize do
+      return false unless @que.length < @max
+
+      @que.push obj
+      begin
+        t = @waiting.shift
+        t.wakeup if t
+      rescue ThreadError
+        retry
+      end
+      return true
+    end
+  end
+end
+
 class Lpxc
 
   #After parsing opts and initializing defaults, the initializer
@@ -59,8 +80,9 @@ class Lpxc
     @conn_timeout = opts[:conn_timeout] || 2
     @batch_size = opts[:batch_size] || 300
     @flush_interval = opts[:flush_interval] || 0.5
-    @logplex_url = URI(opts[:logplex_url] || ENV["LOGPLEX_URL"] ||
-      raise("Must set logplex url."))
+    @user_agent = opts[:user_agent] || ENV["LPXC_USER_AGENT"] || "Lpxc (Ruby #{RUBY_VERSION})"
+    @logplex_url = URI((opts[:logplex_url] || ENV["LOGPLEX_URL"] ||
+      raise("Must set logplex url.")).to_s)
 
     #Keep track of the number of requests that the outlet
     #is processing. This value is used by the wait function.
@@ -71,7 +93,20 @@ class Lpxc
 
     #Start the processing threads.
     Thread.new {outlet}
-    Thread.new {delay_flush} if opts[:disable_delay_flush].nil?
+    Thread.new {delay_flush} unless opts[:disable_delay_flush]
+    at_exit {wait} unless opts[:disable_at_exit_flush]
+  end
+
+  #Automatically create an Lpxc client object for a given URL if none exists,
+  #and use it to send msg using the token from the URL.
+  def self.puts(msg, url, opts={})
+    @lock = Mutex.new
+    url = url.is_a?(URI) ? url : URI(url)
+    server = [url.host, url.port, url.scheme]
+    @clients ||= {}
+    opts[:logplex_url] = url
+    c = @lock.synchronize { @clients[server] ||= Lpxc.new(opts) }
+    c.puts(msg, url.password)
   end
 
   #The interface to publish logs into the stream.
@@ -92,11 +127,15 @@ class Lpxc
   #Wait until all of the data has been cleared from memory.
   #This is useful if you don't want your program to exit before
   #we are able to deliver log messages to logplex.
-  def wait
-    sleep(0.1) until
-      @hash.length.zero? &&
-      @request_queue.empty? &&
-      @req_in_flight.zero?
+  def wait(max=10)
+    Timeout.timeout(max) do
+      sleep(0.1) until
+        @hash.length.zero? &&
+        @request_queue.empty? &&
+        @req_in_flight.zero?
+    end
+    true
+  rescue Timeout::Error => _
   end
 
   # Empty all log messages into a request queue. Messages will be grouped
@@ -131,6 +170,7 @@ class Lpxc
       req = Net::HTTP::Post.new(@logplex_url.path)
       req.basic_auth("token", tok)
       req.add_field('Content-Type', 'application/logplex-1')
+      req.add_field('User-Agent', @user_agent) if @user_agent
       req.body = body
       @request_queue.enq(req)
       @last_flush = Time.now

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: lpxc
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
+  prerelease: 
 platform: ruby
 authors:
 - Ryan Smith (♠ ace hacker)
@@ -20,25 +21,26 @@ files:
 homepage: http://github.com/ryandotsmith/lpxc
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby client for logplex.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a9a59ea66505168840a485b178c9f805df781f4b
-  data.tar.gz: 1181f1e2976a3a6a0fccf4e88a006c66bca90815
-SHA512:
-  metadata.gz: 2c7f0c812aa0f867262d7e178bafa9e804704d0493d5951b65334d479253c3566162cbde8a6ebd9c82f4534e0b650d5780d7bee6b721aee27d57b48d411d02ff
-  data.tar.gz: ef326d1790d550779e7c6e86851228d0dc16fc1da8e87b735ce7a05dab91154ba99291184212c2134b2a6a644f39f983fc757376a47c5f34ab4b2ce7f3362dde