asir 1.1.5 → 1.1.6

data/ChangeLog

@@ -1,3 +1,11 @@
+2012-12-07  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.1.6: New version.
+	* Conduit: handles :conduit_options, pid_file.
+	* Transport: added after_invoke_message callback.
+	* Main: handle --help option.
+	* Main: Don't close stdio stream till worker is running.
+
 2012-12-05  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.1.5: New version.

data/lib/asir/main.rb

@@ -34,6 +34,9 @@ class Main
     self.args = args
     until args.empty?
       case args.first
+      when /^--?h(elp)/
+        @help = true
+        return self
       when /^([a-z0-9_]+=)(.*)/i
         k, v = $1.to_sym, $2
         args.shift
@@ -61,6 +64,9 @@ class Main
   end
 
   def run!
+    if @help
+      return usage!
+    end
     unless verb && adjective && object
       self.exit_code = 1
       return usage!
@@ -172,6 +178,7 @@ EXAMPLES:
   asir start zmq worker 1
   asir start zmq worker 2
 END
+    self
   end
 
   def start_beanstalk_conduit!
@@ -193,11 +200,17 @@ END
   def _start_worker! type = adjective
     log "start_worker! #{type}"
     type = type.to_s
+    config!(:environment)
+    self.transport = config!(:transport)
+
+    # Get the expected transport class.
+    transport_file = "asir/transport/#{type}"
+    log "loading #{transport_file}"
+    require transport_file
+    transport_class = ASIR::Transport.const_get(type[0..0].upcase + type[1..-1])
+
     fork_server! do
-      transport_file = "asir/transport/#{type}"
-      log "loading #{transport_file}"
-      require transport_file
-      _create_transport ASIR::Transport.const_get(type[0..0].upcase + type[1..-1])
+      _create_transport transport_class
       _run_workers!
     end
   end

data/lib/asir/transport.rb

@@ -111,6 +111,10 @@ module ASIR
     # trans.on_result_exception.call(trans, result)
     attr_accessor :on_result_exception
 
+    # Proc to call after #invoke_message!
+    # trans.after_invoke_message.call(trans, message, result)
+    attr_accessor :after_invoke_message
+
     # Proc to call with exception, if exception occurs within #serve_message!, but outside
     # Message#invoke!.
     #
@@ -142,6 +146,9 @@ module ASIR
         message_ok = true
         result = invoke_message!(message)
         result_ok = true
+        if @after_invoke_message
+          @after_invoke_message.call(self, message, result)
+        end
         self
       else
         nil

data/lib/asir/transport/conduit.rb

@@ -4,9 +4,11 @@ module Asir
   class Transport
     # Conduit service support.
     module Conduit
+      attr_accessor :conduit_options, :conduit_pid
       def start_conduit! options = nil
         opts = { :fork => true }
         opts.update(options) if options
+        @conduit_options = opts
         _log { "start_conduit! #{self}" } if @verbose >= 1
         in_fork = opts[:fork]
         raise "already running #{@conduit_pid} #{@conduit_cmd}" if @conduit_pid
@@ -17,18 +19,28 @@ module Asir
             raise "Could not exec"
           end
           _log { "start_conduit! #{self} started pid=#{@conduit_pid.inspect}" } if @verbose >= 2
+          if pid_file = @conduit_options[:pid_file]
+            File.open(pid_file, "w") { | fh | fh.puts @conduit_pid }
+          end
         else
           _start_conduit!
         end
         self
       end
 
+      def conduit_pid
+        if ! @conduit_pid and pid_file = @conduit_options[:pid_file]
+          @conduit_pid = (File.read(pid_file).to_i rescue nil)
+        end
+        @conduit_pid
+      end
+
       def stop_conduit! opts = nil
-        if @conduit_pid
+        if conduit_pid
           _log { "stop_conduit! #{self} pid=#{@conduit_pid.inspect}" } if @verbose >= 1
           ::Process.kill( (opts && opts[:signal]) || 'TERM', @conduit_pid)
+          ::File.unlink(pid_file) rescue nil if pid_file
           ::Process.waitpid @conduit_pid
-          # File.unlink @redis_conf
         end
         self
       ensure

data/lib/asir/version.rb

@@ -1,3 +1,3 @@
 module ASIR
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2012-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -314,7 +314,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3496337274665454137
+      hash: 4585865116450200509
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -323,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3496337274665454137
+      hash: 4585865116450200509
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24