officer 0.7.2 → 0.7.3

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/lib/officer/client.rb

@@ -41,9 +41,10 @@ module Officer
     def with_lock name, options={}
       response = lock name, options
       result = response['result']
+      queue = (response['queue'] || []).join ','
       
-      raise LockTimeoutError if result == 'timed_out'
-      raise LockQueuedMaxError if result == 'queue_maxed'
+      raise LockTimeoutError.new("queue=#{queue}") if result == 'timed_out'
+      raise LockQueuedMaxError.new("queue=#{queue}") if result == 'queue_maxed'
       raise LockError unless %w(acquired already_acquired).include?(result)
 
       begin

data/lib/officer/connection.rb

@@ -65,9 +65,9 @@ module Officer
         end
       end
 
-      def timed_out name
+      def timed_out name, options={}
         @timers.delete name
-        send_result 'timed_out', :name => name
+        send_result 'timed_out', :name => name, :queue => options[:queue]
       end
 
       def locks locks_hash
@@ -78,8 +78,8 @@ module Officer
         send_result 'connections', :value => conns_hash
       end
 
-      def queue_maxed name
-        send_result 'queue_maxed', :name => name
+      def queue_maxed name, options={}
+        send_result 'queue_maxed', :name => name, :queue => options[:queue]
       end
 
       def my_locks names

data/lib/officer/lock_store.rb

@@ -1,12 +1,18 @@
 module Officer
 
+  class LockQueue < Array
+    def to_host_a
+      map {|conn| conn.to_host_s}
+    end
+  end
+
   class Lock
     attr_reader :name
     attr_reader :queue
 
     def initialize name
       @name = name
-      @queue = []
+      @queue = LockQueue.new
     end
   end
 
@@ -29,7 +35,7 @@ module Officer
 
       l.info "locks:"
       @locks.each do |name, lock|
-        l.info "#{name}: connections=[#{lock.queue.map{|c| c.to_host_s}.join(', ')}]"
+        l.info "#{name}: connections=[#{lock.queue.to_host_a.join(', ')}]"
       end
       l.info ''
 
@@ -47,11 +53,11 @@ module Officer
 
     def acquire name, connection, options={}
       if options[:queue_max]
-        if @locks[name] && !@locks[name].queue.include?(connection)
-          if @locks[name].queue.length >= options[:queue_max]
-            connection.queue_maxed name
-            return
-          end
+        lock = @locks[name]
+
+        if lock && !lock.queue.include?(connection) && lock.queue.length >= options[:queue_max]
+          connection.queue_maxed name, :queue => lock.queue.to_host_a
+          return
         end
       end
 
@@ -125,14 +131,14 @@ module Officer
       lock.queue.delete connection
       names.delete name
 
-      connection.timed_out name
+      connection.timed_out name, :queue => lock.queue.to_host_a
     end
 
     def locks connection
       locks = {}
 
       @locks.each do |name, lock|
-        locks[name] = lock.queue.map {|conn| conn.to_host_s}
+        locks[name] = lock.queue.to_host_a
       end
       
       connection.locks locks

data/officer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{officer}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Remesch"]
-  s.date = %q{2010-02-17}
+  s.date = %q{2010-02-19}
   s.default_executable = %q{officer}
   s.description = %q{Distributed lock server and client written in Ruby and EventMachine}
   s.email = %q{chad@remesch.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: officer
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Chad Remesch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 -05:00
+date: 2010-02-19 00:00:00 -05:00
 default_executable: officer
 dependencies: 
 - !ruby/object:Gem::Dependency