officer 0.2.2 → 0.3.0

data/README.markdown

@@ -5,8 +5,8 @@ It is implemented using Ruby and Eventmachine. Inspiration comes from [elock](ht
 
 ## Installation
 
-  install gemcutter
-  gem install officer
+    gem install gemcutter
+    gem install officer
 
 ## Usage
 
@@ -47,7 +47,6 @@ All debugging output goes to stdout for now.
 
 ## Planned Features
 
-- Properly handle nested with_lock() blocks.
 - Option to abort a lock request if there is already a certain number of clients waiting for the lock.
 - Lock statistics.
 - Retrieve the complete list of locks.

data/Rakefile

@@ -12,7 +12,8 @@ begin
     gem.authors = ["Chad Remesch"]
     gem.add_development_dependency "eventmachine", ">= 0"
     gem.add_development_dependency "json", ">= 0"
-    gem.add_development_dependency "active_support", ">= 0"
+    gem.add_development_dependency "activesupport", ">= 0"
+    gem.add_development_dependency "daemons", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/bin/officer

@@ -1,7 +1,15 @@
 #!/usr/bin/env ruby
 
-Dir.chdir File.dirname(__FILE__) + '/../lib'
-
+require 'rubygems'
 require 'officer'
 
-Officer::Server.new.run
+options = {
+  :dir_mode   => :system,
+  :multiple   => false,
+  :monitor    => true
+}
+
+
+Daemons.run_proc('officer', options) do
+  Officer::Server.new.run
+end

data/lib/officer/client.rb

@@ -42,13 +42,16 @@ module Officer
       result = response['result']
       
       raise LockTimeoutError if result == 'timed_out'
-      raise LockError if result != 'acquired'
+      raise LockError unless %w(acquired already_acquired).include?(result)
 
       begin
         yield
       ensure
-        response = unlock name
-        raise UnlockError unless response['result'] == 'released'
+        # Deal with nested with_lock calls.  Only the outer most call should tell the server to unlock.
+        if result == 'acquired'
+          response = unlock name
+          raise UnlockError unless response['result'] == 'released'
+        end
       end
     end
 

data/lib/officer/commands.rb

@@ -57,7 +57,6 @@ module Officer
       register
 
       def execute
-        L.debug 'executing lock command.'
         Officer::LockStore.instance.acquire @name, @connection, :timeout => @timeout
       end
 
@@ -77,7 +76,6 @@ module Officer
       register
 
       def execute
-        L.debug 'executing unlock command.'
         Officer::LockStore.instance.release @name, @connection
       end
 
@@ -95,7 +93,6 @@ module Officer
       register
 
       def execute
-        L.debug 'executing reset command.'
         Officer::LockStore.instance.reset @connection
       end
     end

data/lib/officer/connection.rb

@@ -3,8 +3,6 @@ module Officer
 
     module EmCallbacks
       def post_init
-        L.debug "Client connected."
-
         @connected = true
         @timers = {} # name => Timer
       end
@@ -12,8 +10,6 @@ module Officer
       def receive_line line
         line.chomp!
 
-        L.debug "Received line: #{line}"
-
         command = Officer::Command::Factory.create line, self
         command.execute
 
@@ -25,43 +21,35 @@ module Officer
       def unbind
         @connected = false
 
-        L.debug "client disconnected."
-
         Officer::LockStore.instance.reset self
       end
     end
 
     module LockCallbacks
       def acquired name
-        L.debug "acquired lock: #{name}"
-
         @timers.delete(name).cancel if @timers[name]
 
         send_line({:result => 'acquired', :name => name}.to_json)
       end
 
-      def released name
-        L.debug "released lock: #{name}"
+      def already_acquired name
+        send_line({:result => 'already_acquired', :name => name}.to_json)
+      end
 
+      def released name
         send_line({:result => 'released', :name => name}.to_json)
       end
 
       def release_failed name
-        L.debug "release lock failed: #{name}"
-
         send_line({:result => 'release_failed', :name => name}.to_json)
       end
 
       def reset_succeeded
-        L.debug "reset"
-        
         @timers.values.each {|timer| timer.cancel}
         send_line({:result => 'reset_succeeded'}.to_json)
       end
 
       def queued name, options={}
-        L.debug "queued. options=#{options.inspect}"
-
         timeout = options[:timeout]
 
         return if timeout.nil? || @timers[name]
@@ -72,8 +60,6 @@ module Officer
       end
 
       def timed_out name
-        L.debug "Timed out connection=#{object_id}, name=#{name}"
-
         @timers.delete name
         send_line({:result => 'timed_out', :name => name}.to_json)
       end

data/lib/officer/lock_store.rb

@@ -16,40 +16,47 @@ module Officer
     def initialize
       @locks = {} # name => Lock
       @connections = {} # Connection => Set(name, ...)
+      @acquire_counter = 0
     end
 
     def log_state
-      L.debug '-----'
+      L.info '-----'
 
-      L.debug 'LOCK STORE:'
-      puts
+      L.info 'LOCK STORE:'
+      L.info ''
       
-      puts "locks:"
+      L.info "locks:"
       @locks.each do |name, lock|
-        puts "#{name}: connections=[#{lock.queue.map{|c| c.object_id}.join(', ')}]"
+        L.info "#{name}: connections=[#{lock.queue.map{|c| c.object_id}.join(', ')}]"
       end
-      puts
+      L.info ''
 
-      puts "Connections:"
+      L.info "Connections:"
       @connections.each do |connection, names|
-        puts "#{connection.object_id}: names=[#{names.to_a.join(', ')}]"
+        L.info "#{connection.object_id}: names=[#{names.to_a.join(', ')}]"
       end
-      puts
+      L.info ''
 
-      L.debug '-----'
+      L.info "Acquire Rate: #{@acquire_counter.to_f / 5}/s"
+      @acquire_counter = 0
+      L.info ''
+
+      L.info '-----'
     end
 
     def acquire name, connection, options={}
+      @acquire_counter += 1
+
       lock = @locks[name] ||= Lock.new(name)
 
-      lock.queue << connection unless lock.queue.include? connection
+      if lock.queue.include? connection
+        lock.queue.first == connection ? connection.already_acquired(name) : connection.queued(name, options)
 
-      (@connections[connection] ||= Set.new) << name
-      
-      if lock.queue.first == connection
-        connection.acquired name
       else
-        connection.queued name, options
+        lock.queue << connection
+        (@connections[connection] ||= Set.new) << name
+
+        lock.queue.count == 1 ? connection.acquired(name) : connection.queued(name, options)
       end
     end
 

data/lib/officer/log.rb

@@ -4,7 +4,15 @@ module Officer
     include Singleton
 
     def debug message
-      puts message
+      return unless [:debug].include?(LOG_LEVEL)
+
+      write message
+    end
+
+    def info message
+      return unless [:debug, :info].include?(LOG_LEVEL)
+
+      write message
     end
 
     def debug_exception e
@@ -14,8 +22,14 @@ module Officer
       debug e.backtrace.join "\n  "
       debug '-----'
     end
+
+  private
+    def write message
+      puts message
+    end
   end
   
 end
 
-L = Officer::Log.instance
+L = Officer::Log.instance
+LOG_LEVEL = :info

data/lib/officer/server.rb

@@ -17,7 +17,7 @@ module Officer
         EM::PeriodicTimer.new(5) do
           Officer::LockStore.instance.log_state
         end
-
+        
         EM::start_server @host, @port, Connection::Connection
       end
     end

data/lib/officer.rb

@@ -7,6 +7,7 @@ require 'rubygems'
 require 'active_support'
 require 'eventmachine'
 require 'json'
+require 'daemons'
 
 # Application.
 require 'officer/log'

data/officer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{officer}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Remesch"]
-  s.date = %q{2010-02-03}
+  s.date = %q{2010-02-07}
   s.default_executable = %q{officer}
   s.description = %q{Distributed lock server and client written in Ruby and EventMachine}
   s.email = %q{chad@remesch.com}
@@ -54,16 +54,19 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<eventmachine>, [">= 0"])
       s.add_development_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<active_support>, [">= 0"])
+      s.add_development_dependency(%q<activesupport>, [">= 0"])
+      s.add_development_dependency(%q<daemons>, [">= 0"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<active_support>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<daemons>, [">= 0"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<active_support>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<daemons>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: officer
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Chad Remesch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -05:00
+date: 2010-02-07 00:00:00 -05:00
 default_executable: officer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,17 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: active_support
+  name: activesupport
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: daemons
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement