officer 0.10.0 → 0.10.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    officer (0.10.0)
+    officer (0.10.1)
       choice
       daemons
       eventmachine

data/README.markdown

@@ -13,19 +13,18 @@ Read more in my blog post: [http://remesch.com/officer-the-ruby-lock-server-and-
 Officer uses the 'daemons' gem to simplify creating long lived background processes.
 
 Help information:
-    officer --help
 
-    Usage: officer [-hofplsd]
+    Usage: officer [-hofplsdm]
         -h, --host=HOST                  The hostname or IP to bind to (default: 0.0.0.0)
         -o, --socket-type=OPTION         TCP or UNIX (default: TCP)
-        -f, --socket-file=FILE           Full path and name to the UNIX socket file (only used if --socket-type=UNIX, default: /tmp/officer.sock)
+        -f, --socket-file=FILE           Full path and name to the UNIX domain socket file (only used with '-o UNIX', default: /tmp/officer.sock)
         -p, --port=PORT                  The port to listen on (default: 11500)
         -l, --log-level                  Set the log level to debug, info, or error (default: error)
         -s, --stats                      Log stats every 5 seconds (default: off, required log level: info)
         -d, --pid-dir                    Set directory where pid file will be saved (default: operating system's run directory)
+        -m, --max-idle                   Maximum idle time (in seconds) to wait before closing a connection that is idle and hasn't sent a keep alive (default: 60)
             --help
 
-
 Run Officer in the foreground with full logging and statistics:
 
     officer run -- -l debug -s -d /tmp
@@ -58,7 +57,8 @@ Options:
 - :port => TCP Port to listen on (default: 11500).
 - :socket_type => TCP or UNIX (default: TCP).
 - :socket_file => Full path to the server's UNIX domain socket file (default: /tmp/officer.sock).  This option is only used when the socket type is UNIX.
-
+- :namespace => Prepend a namespace to each lock name (default: empty string).
+- :keep_alive_freq => Frequency (in Hz) to send a keep alive message (default: 6 Hz).
 
 ### Lock
 
@@ -67,7 +67,6 @@ Options:
 Options:
 
 - :timeout => The number of seconds to wait for a lock to become available (default: wait forever).
-- :namespace => Prepend a namespace to each lock name (default: empty string).
 - :queue_max => If the lock queue length is greater than :queue_max then don't wait for the lock (default: infinite).
 
 

data/lib/officer/lock_store.rb

@@ -161,9 +161,12 @@ module Officer
       connection.my_locks my_locks
     end
 
-    def watchdog
+    def close_idle_connections(max_idle)
       @connections.each do |conn, names|
-
+        if conn.last_cmd_at < Time.now.utc - max_idle
+          Officer::Log.error "Closing due to max idle time: #{conn.to_host_s}"
+          conn.close_connection
+        end
       end
     end
   end

data/lib/officer/runner.rb

@@ -69,6 +69,12 @@ module Officer
           desc "Set directory where pid file will be saved (default: operating system's run directory)"
         end
 
+        option :max_idle do
+          short '-m'
+          long '--max-idle'
+          desc "Maximum idle time (in seconds) to wait before closing a connection that is idle and hasn't sent a keep alive (default: 60)"
+        end
+
         option :help do
           long '--help'
         end

data/lib/officer/server.rb

@@ -19,11 +19,19 @@ module Officer
       params[:socket_file] ||= '/tmp/officer.sock'
       params[:stats] ||= false
       params[:log_level] ||= 'error'
+      params[:close_idle] = params.include?(:close_idle) ? params[:close_idle] : true
+      params[:max_idle] ||= 60 # Seconds.
 
       Officer::Log.set_log_level params[:log_level]
     end
 
     def run
+      Officer::Log.debug 'Starting Officer with params:'
+
+      @params.each do |param, value|
+        Officer::Log.debug "  #{param} => #{value}"
+      end
+
       EM.error_handler {|e| Officer::Log.error e}
 
       EM.kqueue = true if EM.kqueue?
@@ -33,7 +41,12 @@ module Officer
         if @params[:stats]
           EM::PeriodicTimer.new(5) do
             Officer::LockStore.instance.log_state
-            Officer::LockStore.instance.watchdog
+          end
+        end
+
+        if @params[:close_idle]
+          EM::PeriodicTimer.new(5) do
+            Officer::LockStore.instance.close_idle_connections @params[:max_idle]
           end
         end
 

data/lib/officer/version.rb

@@ -1,3 +1,3 @@
 module Officer
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: officer
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70138100800420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70138100800420
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70138100799880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70138100799880
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70138100799300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70138100799300
 - !ruby/object:Gem::Dependency
   name: choice
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70138100798800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70138100798800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70138100798280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70138100798280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70138100797740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,12 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70138100797740
 description: Officer is designed to help you coordinate distributed processes and
   avoid race conditions.
 email:
@@ -151,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2483715139742074305
+      hash: -2468263928416701502
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -160,10 +130,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2483715139742074305
+      hash: -2468263928416701502
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Ruby lock server and client built on EventMachine.