asir 1.2.3 → 1.2.5

data/ChangeLog

@@ -1,3 +1,17 @@
+2012-03-12  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.2.5: New Version: bin/asir.
+	* Do not log error if pid_file does not exist.
+	* Handle fork_process= option.
+	* export ASIR_WORKER=instance:wid for asir start KIND worker.
+	* export ASIR_CONDUIT=1 for asir start KIND conduit.
+	* Remove pid_file if process is not running after asir stop.
+
+2012-02-01  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.2.4: New Version: Bug fixes.
+	* Handle STDIO properly in potentially daemonized processes.
+
 2013-01-16  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.2.3: New Version: Bug fixes.

data/example/config/asir_config.rb

@@ -10,12 +10,14 @@ when :configure
 when :environment
   require 'rubygems'
 
+  $:.unshift File.expand_path('../..', __FILE__)
+  $:.unshift File.expand_path('../../../lib', __FILE__)
+
   require 'asir'
   require 'asir/transport/file'
   require 'asir/coder/marshal'
   require 'asir/coder/yaml'
 
-  $:.unshift File.expand_path('..')
   require 'example_helper'
   require 'sample_service'
   require 'unsafe_service'

data/lib/asir/environment.rb

@@ -5,6 +5,7 @@ module ASIR; class Environment
   attr_accessor :verb, :adjective, :object, :identifier
   attr_accessor :config_rb, :config
   attr_accessor :log_dir, :log_file, :pid_dir
+  attr_accessor :fork_process
   attr_accessor :options
   attr_accessor :verbose
 
@@ -30,6 +31,14 @@ module ASIR; class Environment
       '/tmp'
   end
 
+  def fork_process
+    case @fork_process
+    when nil, String, Integer
+      @fork_process = (@fork_process || ENV['ASIR_FORK_PROCESS'] || '1').to_i > 0
+    end
+    @fork_process
+  end
+
   def find_writable_directory kind, *list
     list.
       reject { | p | ! p }.

data/lib/asir/main.rb

@@ -9,7 +9,7 @@ class Main
   [ :verb, :adjective, :object, :identifier,
     :config_rb,
     :verbose,
-    :options,
+    :options, :fork_process,
     :log_dir, :log_file,
     :pid_dir, :pid_file,
   ].
@@ -113,16 +113,18 @@ class Main
     when /^status_([^_]+)_([^_]+)!$/
       pid = server_pid
       puts "#{log_str} pid #{pid}"
-      system("ps -fw -p #{pid}")
+      system("ps -fw -p #{pid}") if pid
     when /^log_([^_]+)_([^_]+)!$/
       puts log_file
     when /^taillog_([^_]+)_([^_]+)!$/
       exec "tail -f #{log_file.inspect}"
     when /^pid_([^_]+)_([^_]+)!$/
-      pid = _alive?
+      pid = server_pid
+      alive = !! _alive?
       puts "#{pid_file} #{pid || :NA} #{alive}"
     when /^alive_([^_]+)_([^_]+)!$/
-      pid = _alive?
+      pid = server_pid
+      alive = !! _alive?
       puts "#{pid_file} #{pid || :NA} #{alive}" if @verbose
       self.exit_code += 1 unless alive
     when /^stop_([^_]+)_([^_]+)!$/
@@ -147,6 +149,7 @@ OPTIONS:
   pid_dir=dir/      ($ASIR_PID_DIR)
   log_dir=dir/      ($ASIR_LOG_DIR)
   verbose=[0-9]
+  fork_process=[01] ($ASIR_FORK_PROCESS)
 
 VERBS:
   start
@@ -201,6 +204,7 @@ END
     config!(:environment)
     self.transport = config!(:transport)
     fork_server! do
+      ENV['ASIR_CONDUIT'] = '1'
       transport.start_conduit! :fork => false
     end
   end
@@ -228,29 +232,51 @@ END
   end
 
   def fork_server! cmd = nil, &blk
-    pid = Process.fork do
+    fork_process! do
       run_server! cmd, &blk
     end
-    log "forked pid #{pid}"
-    Process.detach(pid) # Forks a Thread?  We are gonna exit anyway.
-    File.open(pid_file, "w+") { | o | o.puts pid }
-    File.chmod(0666, pid_file) rescue nil
 
-    # Wait and check if process still exists.
-    sleep 3
-    unless process_running? pid
-      raise "Server process #{pid} died to soon?"
+    self
+  end
+
+  def fork_process! &blk
+    if fork_process
+      pid = Process.fork &blk
+      log "forked pid #{pid}"
+      Process.detach(pid) # Forks a Thread?  We are gonna exit anyway.
+      write_pid_file! pid
+
+      # Wait and check if process still exists.
+      sleep 3
+      unless process_running? pid
+        raise "Server process #{pid} died to soon?"
+      end
+    else
+      pid = $$
+      log "running pid #{pid}"
+      write_pid_file! pid
+      yield
     end
+    pid
+  end
 
-    self
+  def write_pid_file! pid
+    File.open(pid_file, "w+") { | o | o.puts pid }
+    File.chmod(0666, pid_file) rescue nil
   end
 
   def run_server! cmd = nil
+    nf = File.open("/dev/null")
+    nf.sync = true
+    STDIN.reopen(nf)
+    STDIN.sync = true
+    $stdin.reopen(nf) if $stdin.object_id != STDIN.object_id
+    $stdin.sync = true
+
     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
@@ -259,6 +285,7 @@ END
     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
@@ -282,7 +309,10 @@ END
   def kill_server!
     log "#{log_str} kill"
     pid = server_pid
-    stop_pid! pid
+    case stop_pid! pid
+    when :not_running
+      File.unlink(pid_file) rescue nil
+    end
   rescue ::Exception => exc
     log "#{log_str} ERROR\n#{exc.inspect}\n  #{exc.backtrace * "\n  "}", :stderr
     raise
@@ -290,7 +320,7 @@ END
 
   def log msg, to_stderr = false
     if to_stderr
-      $stderr.puts "#{log_str_no_time} #{msg}"
+      $stderr.puts "#{log_str_no_time} #{msg}" rescue nil
     end
     File.open(log_file, "a+") do | log |
       log.puts "#{log_str} #{msg}"
@@ -298,8 +328,8 @@ END
   end
 
   def server_pid
-    pid = File.read(pid_file).chomp!
-    pid.to_i
+    File.exist?(pid_file) &&
+      File.read(pid_file).chomp!.to_i
   end
 
   def _create_transport default_class
@@ -318,7 +348,6 @@ END
 
   def _run_workers!
     $0 = "#{progname} #{adjective} #{object} #{identifier}"
-
     worker_id = 0
     transport.prepare_server!
     worker_processes = transport[:worker_processes] || 1
@@ -332,13 +361,14 @@ END
       log "forked #{wid} pid #{pid}"
     end
 
-    _run_transport_server!
+    _run_transport_server! 0
   ensure
     log "worker 0 stopped"
     _stop_workers!
   end
 
   def _run_transport_server! wid = 0
+    ENV['ASIR_WORKER'] = "#{identifier}:#{wid}"
     log "running transport worker #{transport.class} #{wid}"
     config!(:start)
     $0 += " #{wid} #{transport.uri rescue nil}"
@@ -380,9 +410,11 @@ END
       end
       if process_running? pid
         log "cant-stop pid #{pid}", :stderr
+        :cant_stop
       end
     else
       log "not-running? pid #{pid}", :stderr
+      :not_running
     end
   end
 

data/lib/asir/transport/conduit.rb

@@ -15,7 +15,8 @@ module Asir
         raise "already running #{@conduit_pid} #{@conduit_cmd}" if @conduit_pid
         if in_fork
           @conduit_pid = ::Process.fork do
-          _log { "start_conduit! #{self} starting pid=#{$$.inspect}" } if @verbose >= 2
+            _log { "start_conduit! #{self} starting pid=#{$$.inspect}" } if @verbose >= 2
+            _close_stdio!
             _start_conduit!
             raise "Could not exec"
           end
@@ -24,11 +25,19 @@ module Asir
             ::File.open(pid_file, "w") { | fh | fh.puts @conduit_pid }
           end
         else
+          _close_stdio!
           _start_conduit!
         end
         self
       end
 
+      def _close_stdio!
+        n = ::File.open("/dev/null", "w+")
+        [ STDIN, STDOUT, STDERR, $stdin, $stdout, $stderr ].each do | io |
+          io.reopen(n) rescue nil
+        end
+      end	
+
       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)

data/lib/asir/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -270,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 418469004383493429
+      hash: 1538140158003957969
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -279,10 +279,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 418469004383493429
+      hash: 1538140158003957969
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Abstracting Services in Ruby