officer 0.4.0 → 0.5.0

data/README.markdown

@@ -61,13 +61,22 @@ Run Officer in the background (production mode) and listen on a specific IP and
 
 - Useful if you use Officer with Phusion Passenger and smart spawning.  See [Passenger's documentation](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_smart_spawning_gotcha_1_unintential_file_descriptor_sharing) for more information.
 
+### Locks
+
+  client.locks
+
+- Returns the internal state of all the server's locks.
+
+### Connections
+
+  client.connections
+
+- Returns the internal state of all the server's connections.
+
 ## Planned Features
 
-- Lock statistics.
-- Retrieve the complete list of locks.
 - Retrieve the list of locks for the current connection.
 - Client: Option to abort a lock request if there is already a certain number of clients waiting for the lock.
-- Server: Make IP and port configurable.
 
 ## Copyright
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/bin/officer

@@ -41,7 +41,7 @@ def parse_command_line
   end
 end
 
-Daemons.run_proc('officer', daemon_options) do
+#Daemons.run_proc('officer', daemon_options) do
   parse_command_line
   Officer::Server.new(Choice.choices).run
-end
+#end

data/lib/officer/client.rb

@@ -29,11 +29,11 @@ module Officer
     end
 
     def lock name, options={}
-      execute({:command => 'lock', :name => name, :timeout => options[:timeout]}.to_json)
+      execute :command => 'lock', :name => name, :timeout => options[:timeout]
     end
 
     def unlock name
-      execute({:command => 'unlock', :name => name}.to_json)
+      execute :command => 'unlock', :name => name
     end
 
     def with_lock name, options={}
@@ -55,7 +55,15 @@ module Officer
     end
 
     def reset
-      execute({:command => 'reset'}.to_json)
+      execute :command => 'reset'
+    end
+
+    def locks
+      execute :command => 'locks'
+    end
+
+    def connections
+      execute :command => 'connections'
     end
 
   private
@@ -72,6 +80,7 @@ module Officer
     end
 
     def execute command
+      command = command.to_json
       @socket.write command + "\n"
       result = @socket.gets "\n"
       JSON.parse result.chomp

data/lib/officer/commands.rb

@@ -96,5 +96,21 @@ module Officer
         Officer::LockStore.instance.reset @connection
       end
     end
+
+    class Locks < Base
+      register
+
+      def execute
+        Officer::LockStore.instance.locks @connection
+      end
+    end
+
+    class Connections < Base
+      register
+
+      def execute
+        Officer::LockStore.instance.connections @connection
+      end
+    end
   end
 end

data/lib/officer/connection.rb

@@ -25,7 +25,7 @@ module Officer
       end
     end
 
-    module LockCallbacks
+    module LockStoreCallbacks
       def acquired name
         @timers.delete(name).cancel if @timers[name]
 
@@ -63,11 +63,24 @@ module Officer
         @timers.delete name
         send_line({:result => 'timed_out', :name => name}.to_json)
       end
+
+      def locks locks_hash
+        send_line({:result => 'locks', :value => locks_hash}.to_json)
+      end
+
+      def connections conns_hash
+        send_line({:result => 'connections', :value => conns_hash}.to_json)
+      end
     end
 
     class Connection < EventMachine::Protocols::LineAndTextProtocol
       include EmCallbacks
-      include LockCallbacks
+      include LockStoreCallbacks
+
+      def to_host_s
+        port, ip = Socket.unpack_sockaddr_in get_peername
+        "#{ip}:#{port}"
+      end
 
     private
       attr_reader :connected

data/lib/officer/lock_store.rb

@@ -114,6 +114,26 @@ module Officer
 
       connection.timed_out name
     end
+
+    def locks connection
+      locks = {}
+
+      @locks.each do |name, lock|
+        locks[name] = lock.queue.map {|conn| conn.to_host_s}
+      end
+      
+      connection.locks locks
+    end
+
+    def connections connection
+      connections = {}
+
+      @connections.each do |conn, names|
+        connections[conn.to_host_s] = names
+      end
+
+      connection.connections connections
+    end
   end
 
 end

data/lib/officer/log.rb

@@ -33,4 +33,4 @@ module Officer
 end
 
 L = Officer::Log.instance
-LOG_LEVEL = :info
+LOG_LEVEL = :debug

data/lib/officer/server.rb

@@ -1,12 +1,12 @@
+require 'ruby-debug'
+
 module Officer
 
   class Server
-    def initialize options={}
-      options.reverse_merge! :port => 11500, :host => '0.0.0.0', :verbose => false
-
-      @port = options[:port]
-      @host = options[:host]
-      @verbose = options[:verbose]
+    def initialize opts={}
+      @port      = opts[:port]    || 11500
+      @host      = opts[:host]    || '0.0.0.0'
+      @verbose   = opts[:verbose] || false
     end
 
     def run
@@ -20,7 +20,7 @@ module Officer
             Officer::LockStore.instance.log_state
           end
         end
-        
+
         EM::start_server @host, @port, Connection::Connection
       end
     end

data/officer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{officer}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Remesch"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: officer
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Chad Remesch