asir 1.2.2 → 1.2.3

data/ChangeLog

@@ -1,3 +1,12 @@
+2013-01-16  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.2.3: New Version: Bug fixes.
+	* bin/asir: asir start * worker will check for existing processes, use force=true to forcefully start.
+	* bin/asir: Fixed after_receive_message callback.
+	* Transport: _after_invoke_message.
+	* Transport: Use with_force_stop! during blocked I/O.
+	* Conduit: ::File not Transport::File.
+
 2012-12-31  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.2.2: New Version: JRuby support.

data/lib/asir/main.rb

@@ -119,12 +119,10 @@ class Main
     when /^taillog_([^_]+)_([^_]+)!$/
       exec "tail -f #{log_file.inspect}"
     when /^pid_([^_]+)_([^_]+)!$/
-      pid = server_pid rescue nil
-      alive = process_running? pid
+      pid = _alive?
       puts "#{pid_file} #{pid || :NA} #{alive}"
     when /^alive_([^_]+)_([^_]+)!$/
-      pid = server_pid rescue nil
-      alive = process_running? pid
+      pid = _alive?
       puts "#{pid_file} #{pid || :NA} #{alive}" if @verbose
       self.exit_code += 1 unless alive
     when /^stop_([^_]+)_([^_]+)!$/
@@ -134,6 +132,11 @@ class Main
     end
   end
 
+  def _alive?
+    pid = server_pid rescue nil
+    process_running? pid
+  end
+
   def usage!
     $stderr.puts <<"END"
 SYNOPSIS:
@@ -189,7 +192,12 @@ END
     _start_conduit!
   end
 
-  def _start_conduit!
+  def _start_conduit! type = adjective
+    if (pid = _alive?) && ! force
+      log "already-running pid #{pid}", :stderr
+      return
+    end
+    log "start_conduit! #{type}"
     config!(:environment)
     self.transport = config!(:transport)
     fork_server! do
@@ -198,6 +206,10 @@ END
   end
 
   def _start_worker! type = adjective
+    if (pid = _alive?) && ! force
+      log "already-running pid #{pid}", :stderr
+      return
+    end
     log "start_worker! #{type}"
     type = type.to_s
     config!(:environment)
@@ -235,13 +247,18 @@ END
 
   def run_server! cmd = nil
     lf = File.open(log_file, "a+")
+    lf.sync = true
     File.chmod(0666, log_file) rescue nil
     $stdin.close rescue nil
     STDIN.close rescue nil
     STDOUT.reopen(lf)
+    STDOUT.sync = true
     $stdout.reopen(lf) if $stdout.object_id != STDOUT.object_id
+    $stdout.sync = true
     STDERR.reopen(lf)
+    STDERR.sync = true
     $stderr.reopen(lf) if $stderr.object_id != STDERR.object_id
+    $stderr.sync = true
     # Process.daemon rescue nil # Ruby 1.9.x only.
     lf.puts "#{log_str} starting pid #{$$}"
     begin
@@ -326,8 +343,9 @@ END
     config!(:start)
     $0 += " #{wid} #{transport.uri rescue nil}"
     old_arg0 = $0.dup
-    after_receive_message = transport.after_receive_message || lambda { | transport, message | nil }
-    transport.after_receive_message = lambda do | transport, message |
+    after_receive_message = transport.after_receive_message || lambda { | transport, state | nil }
+    transport.after_receive_message = lambda do | transport, state |
+      message = state.message
       $0 = "#{old_arg0} #{transport.message_count} #{message.identifier}"
       after_receive_message.call(transport, message)
     end
@@ -371,13 +389,12 @@ END
   def process_running? pid
     case pid
     when false, nil
-      pid
     when Integer
       Process.kill(0, pid)
     else
       raise TypeError, "expected false, nil, Integer; given #{pid.inspect}"
     end
-    true
+    pid
   rescue ::Errno::ESRCH
     false
   rescue ::Exception => exc

data/lib/asir/transport.rb

@@ -104,19 +104,19 @@ module ASIR
     attr_accessor :message_count
 
     # A Proc to call within #receive_message, after #_receive_message.
-    # trans.after_receive_message(trans, message)
+    # trans.after_receive_message(trans, state)
     attr_accessor :after_receive_message
 
     # A Proc to call within #send_message, before #_send_message.
-    # trans.before_send_message(trans, message)
+    # trans.before_send_message(trans, state)
     attr_accessor :before_send_message
 
-    # Proc to call with #invoke_message! if result.exception.
-    # trans.on_result_exception.call(trans, result)
+    # Proc to call with #invoke_message! if state.result.exception.
+    # trans.on_result_exception.call(trans, state)
     attr_accessor :on_result_exception
 
     # Proc to call after #invoke_message!
-    # trans.after_invoke_message.call(trans, message, result)
+    # trans.after_invoke_message.call(trans, state)
     attr_accessor :after_invoke_message
 
     # Proc to call with exception, if exception occurs within #serve_message!, but outside
@@ -150,9 +150,6 @@ module ASIR
         message_ok = true
         invoke_message!(state)
         result_ok = true
-        if @after_invoke_message
-          @after_invoke_message.call(self, state)
-        end
         self
       else
         nil
@@ -161,7 +158,7 @@ module ASIR
       raise
     rescue ::Exception => exc
       exception = original_exception = exc
-      _log [ :message_error, exc ]
+      _log [ :message_error, exc, exc.backtrace ]
       @on_exception.call(self, exc, :message, state) if @on_exception
     ensure
       begin
@@ -195,10 +192,18 @@ module ASIR
     def stop! force = false
       @running = false
       stop_server! if respond_to?(:stop_server!)
-      raise Error::Terminate if force
+      raise Error::Terminate if force || @force_stop
       self
     end
 
+    def with_force_stop!
+      force_stop_save = @force_stop
+      @force_stop = true
+      yield
+    ensure
+      @force_stop = force_stop_save
+    end
+
     def with_server_signals!
       old_trap = { }
       [ "TERM", "HUP" ].each do | sig |
@@ -248,9 +253,16 @@ module ASIR
         end
       end
       end
+      _after_invoke_message state
+      if @after_invoke_message
+        @after_invoke_message.call(self, state)
+      end
       self
     end
 
+    def _after_invoke_message state
+    end
+
     # The current Message::State.
     attr_accessor_thread :message_state
     # The current Message being invoked.  DEPRECATED.

data/lib/asir/transport/conduit.rb

@@ -21,7 +21,7 @@ module Asir
           end
           _log { "start_conduit! #{self} started pid=#{@conduit_pid.inspect}" } if @verbose >= 2
           if pid_file = (@conduit_options || EMPTY_HASH)[:pid_file]
-            File.open(pid_file, "w") { | fh | fh.puts @conduit_pid }
+            ::File.open(pid_file, "w") { | fh | fh.puts @conduit_pid }
           end
         else
           _start_conduit!
@@ -31,7 +31,7 @@ module Asir
 
       def conduit_pid
         if ! @conduit_pid and pid_file = (@conduit_options || EMPTY_HASH)[:pid_file]
-          @conduit_pid = (File.read(pid_file).to_i rescue nil)
+          @conduit_pid = (::File.read(pid_file).to_i rescue nil)
         end
         @conduit_pid
       end

data/lib/asir/transport/file.rb

@@ -18,22 +18,21 @@ module ASIR
 
       # If not one_way, create a result_file fifo.
       def send_message message
+        result_file_created = false
         unless one_way || message.one_way
-          result_file =
-            message[:result_file] ||=
-            self.result_file ||
+          result_file = message[:result_file] ||= self.result_file ||
             begin
               message.create_identifier!
               "#{self.file}-result-#{message.identifier}"
             end
           unless ::File.exist?(result_file) and result_fifo
             ::ASIR::Fifo.mkfifo(result_file, perms)
-            message[:result_file_created] = true
+            result_file_created = true
           end
         end
         super
       ensure
-        if message[:result_file_created]
+        if result_file_created
           ::File.unlink(result_file) rescue nil
         end
       end
@@ -50,24 +49,26 @@ module ASIR
 
       # Send result to result_file.
       def _send_result state
-        unless one_way || (message = state.message).one_way
-          if result_file = message[:result_file] || self.result_file
-            ::File.open(result_file, "a+") do | stream |
-              _write(state.result_payload, stream, state)
-            end
+        with_result_file state do | result_file |
+          ::File.open(result_file, "a+") do | stream |
+            _write(state.result_payload, stream, state)
           end
         end
       end
 
       # Receive result from result_file.
       def _receive_result state
-        message = state.message
-        result_file = message[:result_file] || self.result_file
-        unless one_way || message.one_way
-          if result_file
-            ::File.open(result_file, "r") do | stream |
-              state.result_payload = _read(stream, state)
-            end
+        with_result_file state do | result_file |
+          ::File.open(result_file, "r") do | stream |
+            state.result_payload = _read(stream, state)
+          end
+        end
+      end
+
+      def with_result_file state
+        unless one_way || (message = state.message).one_way
+          if result_file = message[:result_file] || self.result_file
+            yield result_file
           end
         end
       end

data/lib/asir/transport/payload_io.rb

@@ -31,8 +31,13 @@ module ASIR
         payload
       end
 
-      def _read_line_and_expect! stream, regexp
-        line = stream.readline
+      def _read_line_and_expect! stream, regexp, consume = nil
+        ok = false
+        until ok
+          line = stream.readline
+          _log { "_read_line_and_expect! #{stream} #{line.inspect}" }
+          ok = consume && consume.match(line) ? false : true
+        end
         unless match = regexp.match(line)
           _log { "_read_line_and_expect! #{stream} #{regexp.inspect} !~ #{line.inspect}" }
           raise UnexpectedResponse, "expected #{regexp.inspect}, received #{line.inspect}"

data/lib/asir/version.rb

@@ -1,3 +1,3 @@
 module ASIR
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,114 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: asir
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 2
-  version: 1.2.2
+version: !ruby/object:Gem::Version
+  version: 1.2.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Kurt Stephens
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-31 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+date: 2013-01-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 6
+      - !ruby/object:Gem::Version
         version: 2.3.6
-  name: uuid
-  requirement: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
+      - !ruby/object:Gem::Version
+        version: 2.3.6
+- !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
   type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 1
-        version: 1.4.1
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
   name: rack
-  requirement: *id003
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 0
-        version: 0.9.0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 12
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.12.0
-  name: rspec
-  requirement: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        version: "0.1"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: *id006
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: Abstracting Services in Ruby
 email: ks.ruby@kurtstephens.com
-executables: 
+executables:
 - asir
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -249,37 +255,38 @@ files:
 - spec/uuid_spec.rb
 - spec/yaml_spec.rb
 - stylesheets/slides.css
-has_rdoc: true
 homepage: http://github.com/kstephens/abstracting_services_in_ruby
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+      hash: 418469004383493429
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 418469004383493429
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Abstracting Services in Ruby
-test_files: 
+test_files:
 - spec/client_spec.rb
 - spec/debug_helper.rb
 - spec/demux_spec.rb