throttle-queue 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d0f4a538c9d23d2a21d79b63122c4a0074e4095
-  data.tar.gz: 16859c8f40a47777526ec299ed4721ba955ca55f
+  metadata.gz: 4a42a085e91e37e9a9096ecd3c653409c28d6196
+  data.tar.gz: e4fbd3485adecc8a6145b8f54dd6d8e26e32cf49
 SHA512:
-  metadata.gz: a39194f269635e9b8ece84714010df1e1cedd0194c5133a77fdfb277d71227aa4bf88e1d57e4b5fba2c84e470831a04b5ede2d8f8f287dd83baac54154f29229
-  data.tar.gz: dc984657a36e8238294813d3f10e36ae837bd77764ee0c6a8c2be81648cedaeb2dda1a5334658a75ffab4cf01435ab6e02fe1f24284b73cb74c9029345c7b0ba
+  metadata.gz: ead308e25e05e0dd4ea5b45a87fb6e91a8ce73089580fe5a9bc301729af96afaf4fbb3e04eb196f42a05a8f21ff81bf7c9981b51792eb81725cb05d2ff370a3f
+  data.tar.gz: 4d9f1ca8b89f057f53fea6ecf862b47b72aa10e73da9375548bf299131290bf0ab829b33d72aa884267f2019bd680352e87b3c4a92c5cc2601ffb436a44c600f

data/README.md

@@ -57,8 +57,12 @@ Wait for everything to finish
 
 Each resource is assumed to have a unique identifier, e.g. a filename or a reproducible
 hash value. The queue does not check if the resource exists first, but it will check if
-the id has already been queued. Any time an id is added to the queue, the previous block
-is dropped in favor of the new.
+the id has already been queued. If an id is already in the queue and the same id is
+added as a background job, the block already in the queue is held onto; the new block is
+dropped. If an id is in the background queue, adding it to the foreground will cause the
+background block to be dropped. If an id is in the foreground queue, adding it again
+from another thread will cause the new block to be dropped, and the existing block to be
+waited upon.
 
 Once an id has made it through the queue and been processed, the same id can be added
 again and will be blindly processed again. It is assumed the user of the object knows

data/lib/throttle-queue/multi-process.rb

@@ -1,5 +1,6 @@
 require 'drb'
 require 'fileutils'
+require 'tmpdir'
 require_relative 'single-process.rb'
 
 class ThrottleQueue
@@ -19,24 +20,34 @@ class ThrottleQueue
 		# If this is the first instace of the shared queue, it becomes the master queue and
 		# starts a DRbServer instace. If a DRbServer is already running, it connects to the
 		# queue as a remote DRbObject.
-		def initialize(limit, name = 'ThrottleQueue')
-			tmp = "/tmp/#{name}.sock"
+		#
+		# The ephemeral server port is written to /tmp/ThrottleQueue.sock - use opt[:name]
+		# to override the default queue name and support multiple instances.
+		#
+		# The server will bind according to the machine's hostname - use opt[:host] to
+		# override this, e.g. if there are restrictions on which addresses may be used.
+		def initialize(limit, opt = {})
+			opt[:name] ||= 'ThrottleQueue'
+			opt[:host] ||= Socket.gethostbyname[0] rescue 'localhost'
+
+			tmp = "#{Dir.tmpdir}/#{opt[:name]}.sock"
 			FileUtils.touch tmp
 			File.open(tmp, 'r+') {|f|
 				f.flock File::LOCK_EX
 				begin
 					port = f.read.to_i
+					uri = "druby://#{opt[:host]}:#{port}"
 					if port == 0
 						@queue = ThrottleQueue.new(limit)
-						@drb = DRb.start_service nil, @queue
+						@drb = DRb.start_service uri, @queue
 						f.seek 0, IO::SEEK_SET
 						f.truncate 0
 						f.write @drb.uri[/\d+$/]
 						f.flock File::LOCK_UN
 					else
-						@queue = DRbObject.new_with_uri("druby://localhost:#{port}")
+						@queue = DRbObject.new_with_uri(uri)
 						@queue.idle?
-						@drb = DRb.start_service
+						@drb = DRb.start_service "druby://#{opt[:host]}:0" 
 						f.flock File::LOCK_UN
 					end
 				rescue DRb::DRbConnError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: throttle-queue
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Calhoun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies: []
 description: A thread-safe rate-limited work queue, which allows for background and
   foreground operations.