navy 1.0.5 → 1.0.6

data/examples/navy.conf.rb

@@ -1,4 +1,5 @@
 preload do |admiral|
+  # require 'rainbow'
   admiral.logger.warn "admiral preload"
 end
 
@@ -8,7 +9,7 @@ before_fork do |admiral, captain|
 end
 
 after_fork do |admiral, captain|
-  admiral.logger.warn "admiral (#{captain.label}) after_fork"
+  captain.logger.warn "admiral (#{captain.label}) after_fork"
   captain.logger.warn "captain=#{captain.label} after_fork"
 end
 
@@ -19,41 +20,119 @@ pid "/tmp/navy.pid"
 # stderr_path "/tmp/navy-err.log"
 # stdout_path "/tmp/navy-out.log"
 
+module Jack
+  extend self
+
+  def call(officer)
+    trap(:QUIT) { exit }
+    trap(:TERM) { exit }
+    # raise "HELLO"
+    n = 0
+    loop do
+      puts "#{n} jack called (officer=#{officer.number}) pid: #{officer.officer_pid}"
+      # Jack.logger.info "#{n} jack logger (officer=#{officer.number}) pid: #{officer.officer_pid}"
+      # Navy.logger.info "START_CTX: #{START_CTX.inspect}"
+      # Navy.logger.info "Navy::Admiral::CAPTAINS: #{Navy::Admiral::CAPTAINS.inspect}"
+      # Navy.logger.info "Navy::Admiral::OFFICERS: #{Navy::Captain::OFFICERS.inspect}"
+      sleep officer.number == 0 ? 0.5 : 1
+      n += 1
+    end
+  end
+
+  def logger#(name = nil)
+    require 'logger'
+    # @logger = nil if name
+    @logger ||= Logger.new('/tmp/jack.log')
+  end
+
+  def readers
+    @readers ||= []
+  end
+
+  def reader=(val)
+    (@reader = val).tap do |r|
+      readers.push(r)
+    end
+  end
+
+  def writer=(val)
+    @writer = val
+  end
+
+  def reader
+    @reader
+  end
+
+  def writer
+    @writer
+  end
+end
+
 captain :jack do
 
   stderr_path "/tmp/navy-jack-err.log"
-  stdout_path "/tmp/navy-jack-out.log"
+  # stdout_path "/tmp/navy-jack-out.log"
 
   preload do |captain|
     captain.logger.warn "captain=#{captain.label} preload"
+    # Jack.mutex.synchronize do
+    Jack.logger.info "preload"
+    # end
+    Thread.new do
+      loop do
+        rs, ws = IO.select(Jack.readers, [], [], 1)
+        (rs || []).each do |r|
+          data = r.gets
+          next unless data
+          data.force_encoding("BINARY") if data.respond_to?(:force_encoding)
+          # ps, message = data.split(",", 2)
+          # color = colors[ps.split(".").first]
+          # info message, ps, color
+          # Jack.mutex.synchronize do
+            Jack.logger.info data.strip
+          # end
+        end
+      end
+    end
   end
 
   before_fork do |captain, officer|
     captain.logger.warn "captain=#{captain.label} before_fork"
     officer.logger.warn "(#{captain.label}) officer=#{officer.number} before_fork"
+    Jack.reader, Jack.writer = IO.pipe
+    Jack.reader.sync = true
   end
 
   after_fork do |captain, officer|
+    Jack.reader.close # we don't read
+    Jack.writer.sync = true
     captain.logger.warn "captain=#{captain.label} after_fork"
     officer.logger.warn "(#{captain.label}) officer=#{officer.number} after_fork"
+    $stdout.reopen Jack.writer
+    $stderr.reopen Jack.writer
+  end
+
+  post_fork do |captain, officer|
+    Jack.writer.close
   end
 
   respawn_limit 15, 5
 
-  officers 2 do |officer|
-    trap(:QUIT) { exit }
-    trap(:TERM) { exit }
-    # raise "HELLO"
-    n = 0
-    loop do
-      Navy.logger.info "#{n} jack called (officer=#{officer.number}) pid: #{officer.officer_pid}"
-      # Navy.logger.info "START_CTX: #{START_CTX.inspect}"
-      # Navy.logger.info "Navy::Admiral::CAPTAINS: #{Navy::Admiral::CAPTAINS.inspect}"
-      # Navy.logger.info "Navy::Admiral::OFFICERS: #{Navy::Captain::OFFICERS.inspect}"
-      sleep 1
-      n += 1
-    end
-  end
+  officers 4, Jack
+  # officers 2 do |officer|
+  #   trap(:QUIT) { exit }
+  #   trap(:TERM) { exit }
+  #   # raise "HELLO"
+  #   n = 0
+  #   loop do
+  #     Navy.logger.info "#{n} jack called (officer=#{officer.number}) pid: #{officer.officer_pid}"
+  #     # Navy.logger.info "START_CTX: #{START_CTX.inspect}"
+  #     # Navy.logger.info "Navy::Admiral::CAPTAINS: #{Navy::Admiral::CAPTAINS.inspect}"
+  #     # Navy.logger.info "Navy::Admiral::OFFICERS: #{Navy::Captain::OFFICERS.inspect}"
+  #     sleep 1
+  #     n += 1
+  #   end
+  # end
 
 end
 
@@ -61,6 +140,8 @@ captain :blackbeard do
 
   pid "/tmp/navy-blackbeard.pid"
 
+  # stderr_path '/tmp/navy-blackbeard-err.log'
+
   officers 5 do
     trap(:QUIT) { exit }; trap(:TERM) { exit }; loop { sleep 1 }
   end

data/lib/navy.rb

@@ -11,7 +11,7 @@ require 'logger'
 module Navy
   extend self
   def logger
-    @logger ||= Logger.new($stderr)
+    @logger ||= Navy::ScopedLogger.new(Logger.new($stderr))
   end
 
   def log_error(logger, prefix, exc)
@@ -21,6 +21,7 @@ module Navy
     exc.backtrace.each { |line| logger.error(line) }
   end
 end
+require 'navy/scoped_logger'
 require 'navy/util'
 require 'navy/orders'
 require 'navy/rank'

data/lib/navy/admiral.rb

@@ -30,6 +30,8 @@ class Navy::Admiral < Navy::Rank
   attr_reader :options
 
   def initialize(options = {})
+    self.orig_stderr = $stderr.dup
+    self.orig_stdout = $stdout.dup
     self.reexec_pid = 0
 
     @options                = options.dup
@@ -243,7 +245,10 @@ class Navy::Admiral < Navy::Rank
         CAPTAINS[pid] = captain
         RESPAWNS[label] ||= []
         RESPAWNS[label].push(Time.now)
+        captain.captain_pid = pid
+        post_fork.call(self, captain) if post_fork
       else
+        captain.orders.give!(captain, only: [ :stderr_path, :stdout_path ])
         after_fork.call(self, captain) if after_fork
         captain.start.join
         exit

data/lib/navy/admiral/orders.rb

@@ -11,6 +11,9 @@ class Navy::Admiral::Orders < Navy::Orders
       admiral.logger.info("forked child re-executing...")
     end,
     captains: {},
+    post_fork: ->(admiral, captain) do
+      admiral.logger.debug("captain=#{captain.label} post-fork") if $DEBUG
+    end,
     preload: ->(admiral) do
       admiral.logger.info("admiral preloading...")
     end,

data/lib/navy/captain.rb

@@ -16,6 +16,9 @@ class Navy::Captain < Navy::Rank
   attr_reader :admiral, :options
 
   def initialize(admiral, label, config, options = {})
+    self.orig_stderr = $stderr.dup
+    self.orig_stdout = $stdout.dup
+
     @options                = options.dup
     @options[:use_defaults] = true
     @options[:config_file]  = config
@@ -32,11 +35,12 @@ class Navy::Captain < Navy::Rank
   end
 
   def start
-    orders.give!(self, only: [ :stderr_path, :stdout_path ])
     init_self_pipe!
     QUEUE_SIGS.each do |sig|
       trap(sig) do
-        logger.debug "captain[#{label}] received #{sig}" if $DEBUG
+        if $DEBUG
+          logger.debug "captain[#{label}] received #{sig}"
+        end
         SIG_QUEUE << sig
         awaken_captain
       end
@@ -187,6 +191,8 @@ class Navy::Captain < Navy::Rank
         OFFICERS[pid] = officer
         RESPAWNS[n] ||= []
         RESPAWNS[n].push(Time.now)
+        officer.officer_pid = pid
+        post_fork.call(self, officer) if post_fork
       else
         after_fork.call(self, officer) if after_fork
         officer.start

data/lib/navy/captain/orders.rb

@@ -9,6 +9,9 @@ class Navy::Captain::Orders < Navy::Orders
     end,
     officer_job: -> { trap(:QUIT) { exit }; trap(:TERM) { exit }; loop { sleep 1 } },
     officer_count: 0,
+    post_fork: ->(captain, officer) do
+      captain.logger.debug("(#{captain.label}) officer=#{officer.number} post-fork") if $DEBUG
+    end,
     preload: ->(captain) do
       captain.logger.info("captain=#{captain.label} preloading...")
     end,

data/lib/navy/rank.rb

@@ -2,11 +2,14 @@ class Navy::Rank
 
   attr_accessor :orders
 
-  attr_accessor :before_fork, :after_fork, :before_exec
-  attr_accessor :reexec_pid
+  attr_accessor :before_fork, :after_fork, :before_exec, :post_fork
+  attr_reader   :stdout_path, :stderr_path
+  attr_accessor :reexec_pid, :orig_stdout, :orig_stderr, :current_stdout, :current_stderr
 
   def logger
-    @logger ||= orders[:logger]
+    (@logger ||= orders[:logger]).tap do |log|
+      log.scope = self #if log.respond_to?(:scope=)
+    end
   end
   attr_writer :logger
 
@@ -45,8 +48,14 @@ class Navy::Rank
 
   attr_accessor :preload
 
-  def stdout_path=(path); redirect_io($stdout, path); end
-  def stderr_path=(path); redirect_io($stderr, path); end
+  def stdout_path=(path)
+    @stdout_path = path
+    redirect_io($stdout, path)
+  end
+  def stderr_path=(path)
+    @stderr_path = path
+    redirect_io($stderr, path)
+  end
 
   attr_accessor :timeout
 

data/lib/navy/scoped_logger.rb

@@ -0,0 +1,74 @@
+class Navy::ScopedLogger
+
+  attr_accessor :logger, :scope
+
+  def initialize(logger, scope = nil)
+    @logger, @scope = logger, scope
+  end
+
+  def add(*args, &block)
+    scoped(:add, *args, &block)
+  end
+
+  def debug(*args, &block)
+    scoped(:debug, *args, &block)
+  end
+
+  def info(*args, &block)
+    scoped(:info, *args, &block)
+  end
+
+  def warn(*args, &block)
+    scoped(:warn, *args, &block)
+  end
+
+  def error(*args, &block)
+    scoped(:error, *args, &block)
+  end
+
+  def fatal(*args, &block)
+    scoped(:fatal, *args, &block)
+  end
+
+  def respond_to?(*args)
+    @logger.respond_to?(*args)
+  end
+
+  protected
+
+  def method_missing(name, *args, &block)
+    @logger.__send__(name, *args, &block)
+  end
+
+  def scoped(name, *args, &block)
+    start_scope!
+    retval = @logger.__send__(name, *args, &block)
+    stop_scope!
+    return retval
+  end
+
+  def start_scope!
+    return unless scope
+    scope.current_stdout = $stdout.dup
+    scope.current_stderr = $stderr.dup
+    if scope.stderr_path
+      scope.stderr_path = scope.stderr_path
+    else
+      $stderr.reopen scope.orig_stderr
+    end
+    if scope.stdout_path
+      scope.stdout_path = scope.stdout_path
+    else
+      $stdout.reopen scope.orig_stdout
+    end
+  end
+
+  def stop_scope!
+    return unless scope
+    return unless scope.current_stderr and scope.current_stdout
+    $stdout.reopen scope.current_stdout
+    $stderr.reopen scope.current_stderr
+    scope.current_stderr = scope.current_stdout = nil
+  end
+
+end

data/lib/navy/speak.rb

@@ -33,6 +33,10 @@ class Navy::Speak
 
   def pid(path); set_path(:pid, path); end
 
+  def post_fork(*args, &block)
+    set_hook(:post_fork, block_given? ? block : args[0])
+  end
+
   def preload(*args, &block)
     set_hook(:preload, block_given? ? block : args[0], 1)
   end

data/lib/navy/version.rb

@@ -1,3 +1,3 @@
 module Navy
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navy
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2012-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70170585246280 !ruby/object:Gem::Requirement
+  requirement: &70207025737040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170585246280
+  version_requirements: *70207025737040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70170585245840 !ruby/object:Gem::Requirement
+  requirement: &70207025736560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170585245840
+  version_requirements: *70207025736560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70170585245300 !ruby/object:Gem::Requirement
+  requirement: &70207025735780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70170585245300
+  version_requirements: *70207025735780
 - !ruby/object:Gem::Dependency
   name: kgio
-  requirement: &70170585244760 !ruby/object:Gem::Requirement
+  requirement: &70207025735040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70170585244760
+  version_requirements: *70207025735040
 description: Ruby daemon inspired by Unicorn.
 email:
 - potatosaladx@gmail.com
@@ -80,6 +80,7 @@ files:
 - lib/navy/officer.rb
 - lib/navy/orders.rb
 - lib/navy/rank.rb
+- lib/navy/scoped_logger.rb
 - lib/navy/ship.rb
 - lib/navy/speak.rb
 - lib/navy/util.rb