navy 1.0.6 → 1.0.7

data/examples/navy.conf.rb

@@ -20,12 +20,52 @@ pid "/tmp/navy.pid"
 # stderr_path "/tmp/navy-err.log"
 # stdout_path "/tmp/navy-out.log"
 
+# class Jacky
+
+#   SELF_PIPE = []
+
+#   def initialize
+#     init_self_pipe!
+#   end
+
+#   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
+#     @logger ||= Logger.new('/tmp/jack.log')
+#   end
+
+#   private
+
+#   def init_self_pipe!
+    
+#   end
+
+# end
+
 module Jack
+
+  SELF_PIPE = []
+
   extend self
 
   def call(officer)
     trap(:QUIT) { exit }
     trap(:TERM) { exit }
+
     # raise "HELLO"
     n = 0
     loop do
@@ -39,20 +79,20 @@ module Jack
     end
   end
 
-  def logger#(name = nil)
-    require 'logger'
-    # @logger = nil if name
+  def logger
     @logger ||= Logger.new('/tmp/jack.log')
   end
 
+  def logger=(val)
+    @logger = val
+  end
+
   def readers
-    @readers ||= []
+    @readers ||= {}
   end
 
   def reader=(val)
-    (@reader = val).tap do |r|
-      readers.push(r)
-    end
+    @reader = val
   end
 
   def writer=(val)
@@ -66,6 +106,71 @@ module Jack
   def writer
     @writer
   end
+
+  def main_reader=(val)
+    @main_reader = val
+  end
+
+  def main_writer=(val)
+    @main_writer = val
+  end
+
+  def main_reader
+    @main_reader
+  end
+
+  def main_writer
+    @main_writer
+  end
+
+  def threads
+    @threads ||= {}
+  end
+
+  def start
+    @thread ||= Thread.new do
+      loop do
+        IO.select([ SELF_PIPE[0] ], nil, nil, 0.1) or next
+        data = SELF_PIPE[0].gets
+        next unless data
+        data.force_encoding("BINARY") if data.respond_to?(:force_encoding)
+        pid, message = data.split(',', 2)
+        Jack.logger.info "YOUR PID WAS: #{pid}; #{message.strip}"
+        # Jack.logger.info data
+      end
+    end
+  end
+
+  def stop
+    if @thread
+      @thread.terminate rescue nil
+    end
+    SELF_PIPE.each { |io| io.close rescue nil }
+  end
+
+  # def main_thread(captain = nil)
+  #   @main_thread = nil if @main_thread and @main_thread.stop?
+  #   if @main_thread.nil?
+  #     # Jack.main_reader.close rescue nil
+  #     # Jack.main_writer.close rescue nil
+  #     Jack.main_reader, Jack.main_writer = IO.pipe
+  #     Jack.main_reader.sync = true
+  #     Jack.main_writer.sync = true
+  #   end
+  #   @main_thread ||= Thread.new do
+  #     readers = [Jack.main_reader]
+  #     loop do
+  #       rs, ws = IO.select(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)
+  #         Jack.logger.info "pid: #{ps}, message: #{message.to_s.strip}"
+  #       end
+  #     end
+  #   end
+  # end
 end
 
 captain :jack do
@@ -75,45 +180,100 @@ captain :jack do
 
   preload do |captain|
     captain.logger.warn "captain=#{captain.label} preload"
-    # Jack.mutex.synchronize do
+    Jack::SELF_PIPE.each { |io| io.close rescue nil }
+    # Jack::SELF_PIPE.replace(Kgio::Pipe.new)
+    Jack::SELF_PIPE.replace(IO.pipe)
+    Jack::SELF_PIPE.each { |io| io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC); io.sync = true }
     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
+    Jack.start
   end
 
   before_fork do |captain, officer|
+    # Jack.main_thread(captain)
     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
+    # if r = Jack.readers.delete(officer.number)
+    #   r.close
+    # end
+    # Jack.readers[officer.number], Jack.writer = IO.pipe
+    # Jack.reader = Jack.readers[officer.number]
+    # Jack.reader.sync = true
   end
 
   after_fork do |captain, officer|
-    Jack.reader.close # we don't read
-    Jack.writer.sync = true
+    # 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
+    # $stdout.reopen Jack.writer
+    # $stderr.reopen Jack.writer
+
+    reader, writer = IO.pipe
+    $stdout.reopen writer
+    $stdout.reopen writer
+
+    Thread.new do
+      until reader.eof?
+        Jack::SELF_PIPE[1].puts "%s,%s" % [ officer.officer_pid, reader.gets ]
+      end
+    end
+  end
+
+  after_stop do |captain, graceful|
+    Jack.stop if graceful
   end
 
   post_fork do |captain, officer|
-    Jack.writer.close
+    # Jack.writer.close # we don't write
+    # if t = Jack.threads[officer.number]
+    #   t.terminate unless t.stop?
+    # else
+    #   Jack.threads[officer.number] = Thread.new do
+    #     reader = Jack.reader
+    #     until reader.eof?
+    #       Jack::SELF_PIPE[1].puts "%s,%s" % [ officer.officer_pid, reader.gets ]
+    #     end
+    #   end
+    # end
+    # Jack.reader.lcose
+    # Thread.new do
+    #   # Jack.main_reader.close
+    #   # Jack.main_writer.close
+    #   loop do
+    #     rs, ws = IO.select([Jack.reader], [], [], 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 "pid: #{ps}, message: #{message}"
+    #       # Jack.logger.info data.strip
+    #       # end
+    #       Jack.main_writer.puts "pidpidpid: #{officer.officer_pid}, message: #{data}"
+    #     end
+    #   end
+    # end
+    # Thread.new do
+    #   reader, writer = Jack.reader, Jack.writer
+    #   loop do
+    #     rs, ws = IO.select([reader], [], [], 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 "pid: #{ps}, message: #{message}"
+    #       writer.write "%s,%s" [ '13', data ]
+    #       # end
+    #     end
+    #   end
+    # end
   end
 
   respawn_limit 15, 5

data/lib/navy/admiral.rb

@@ -131,6 +131,7 @@ class Navy::Admiral < Navy::Rank
 
   # Terminates all captains, but does not exit admiral process
   def stop(graceful = true)
+    before_stop.call(self, graceful) if before_stop
     limit = Time.now + timeout
     until CAPTAINS.empty? || Time.now > limit
       kill_each_captain(graceful ? :QUIT : :TERM)
@@ -138,6 +139,7 @@ class Navy::Admiral < Navy::Rank
       reap_all_captains
     end
     kill_each_captain(:KILL)
+    after_stop.call(self, graceful) if after_stop
   end
 
   private

data/lib/navy/admiral/orders.rb

@@ -4,12 +4,18 @@ class Navy::Admiral::Orders < Navy::Orders
     after_fork: ->(admiral, captain) do
       admiral.logger.info("captain=#{captain.label} spawned pid=#{$$}")
     end,
+    after_stop: ->(admiral, graceful) do
+      admiral.logger.debug("admiral after (#{graceful ? 'graceful' : 'hard'}) stop") if $DEBUG
+    end,
     before_fork: ->(admiral, captain) do
       admiral.logger.info("captain=#{captain.label} spawning...")
     end,
     before_exec: ->(admiral) do
       admiral.logger.info("forked child re-executing...")
     end,
+    before_stop: ->(admiral, graceful) do
+      admiral.logger.debug("admiral before (#{graceful ? 'graceful' : 'hard'}) stop") if $DEBUG
+    end,
     captains: {},
     post_fork: ->(admiral, captain) do
       admiral.logger.debug("captain=#{captain.label} post-fork") if $DEBUG

data/lib/navy/captain.rb

@@ -120,6 +120,7 @@ class Navy::Captain < Navy::Rank
 
   # Terminates all captains, but does not exit admiral process
   def stop(graceful = true)
+    before_stop.call(self, graceful) if before_stop
     limit = Time.now + timeout
     until OFFICERS.empty? || Time.now > limit
       kill_each_officer(graceful ? :QUIT : :TERM)
@@ -127,6 +128,7 @@ class Navy::Captain < Navy::Rank
       reap_all_officers
     end
     kill_each_officer(:KILL)
+    after_stop.call(self, graceful) if after_stop
   end
 
   private

data/lib/navy/captain/orders.rb

@@ -4,9 +4,15 @@ class Navy::Captain::Orders < Navy::Orders
     after_fork: ->(captain, officer) do
       captain.logger.info("(#{captain.label}) officer=#{officer.number} spawned pid=#{$$}")
     end,
+    after_stop: ->(captain, graceful) do
+      captain.logger.debug("captain=#{captain.label} after (#{graceful ? 'graceful' : 'hard'}) stop") if $DEBUG
+    end,
     before_fork: ->(captain, officer) do
       captain.logger.info("(#{captain.label}) officer=#{officer.number} spawning...")
     end,
+    before_stop: ->(captain, graceful) do
+      captain.logger.debug("captain=#{captain.label} before (#{graceful ? 'graceful' : 'hard'}) stop") if $DEBUG
+    end,
     officer_job: -> { trap(:QUIT) { exit }; trap(:TERM) { exit }; loop { sleep 1 } },
     officer_count: 0,
     post_fork: ->(captain, officer) do

data/lib/navy/rank.rb

@@ -2,7 +2,7 @@ class Navy::Rank
 
   attr_accessor :orders
 
-  attr_accessor :before_fork, :after_fork, :before_exec, :post_fork
+  attr_accessor :before_fork, :after_fork, :before_exec, :post_fork, :before_stop, :after_stop
   attr_reader   :stdout_path, :stderr_path
   attr_accessor :reexec_pid, :orig_stdout, :orig_stderr, :current_stdout, :current_stderr
 

data/lib/navy/speak.rb

@@ -18,10 +18,18 @@ class Navy::Speak
     set_hook(:after_fork, block_given? ? block : args[0])
   end
 
+  def after_stop(*args, &block)
+    set_hook(:after_stop, block_given? ? block : args[0])
+  end
+
   def before_fork(*args, &block)
     set_hook(:before_fork, block_given? ? block : args[0])
   end
 
+  def before_stop(*args, &block)
+    set_hook(:before_stop, block_given? ? block : args[0])
+  end
+
   def logger(obj)
     %w(debug info warn error fatal).each do |m|
       obj.respond_to?(m) and next

data/lib/navy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navy
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70207025737040 !ruby/object:Gem::Requirement
+  requirement: &70187979402440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207025737040
+  version_requirements: *70187979402440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70207025736560 !ruby/object:Gem::Requirement
+  requirement: &70187979401840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207025736560
+  version_requirements: *70187979401840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70207025735780 !ruby/object:Gem::Requirement
+  requirement: &70187979401100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70207025735780
+  version_requirements: *70187979401100
 - !ruby/object:Gem::Dependency
   name: kgio
-  requirement: &70207025735040 !ruby/object:Gem::Requirement
+  requirement: &70187979400340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70207025735040
+  version_requirements: *70187979400340
 description: Ruby daemon inspired by Unicorn.
 email:
 - potatosaladx@gmail.com