navy 0.0.1 → 0.0.2

data/lib/navy/admiral.rb

@@ -25,7 +25,7 @@ class Navy::Admiral < Navy::Rank
     Dir.pwd
   end
 
-  attr_accessor :admiral_pid, :reexec_pid
+  attr_accessor :admiral_pid
   attr_reader :captains, :options, :timeout
 
   def initialize(options = {})
@@ -33,15 +33,17 @@ class Navy::Admiral < Navy::Rank
     @ready_pipe = @options.delete(:ready_pipe)
     @timeout = 60
     self.reexec_pid = 0
+    self.pid = "/tmp/navy.pid"
     @captains = {
       admin: {
+        number: 3,
         job: ->(*args) {
           trap(:QUIT) { exit }
           trap(:TERM) { exit }
           n = 0
           loop do
-            Navy.logger.info "#{n} admin called #{args.inspect}"
-            Navy.logger.info "START_CTX: #{START_CTX.inspect}"
+            # Navy.logger.info "#{n} admin called #{args.inspect}"
+            # 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 10
@@ -50,12 +52,13 @@ class Navy::Admiral < Navy::Rank
         }
       },
       user: {
+        number: 3,
         job: ->(*args) {
           trap(:QUIT) { exit }
           trap(:TERM) { exit }
           n = 0
           loop do
-            Navy.logger.info "#{n} user called #{args.inspect}"
+            # Navy.logger.info "#{n} user called #{args.inspect}"
             # Navy.logger.info "Navy::Admiral::CAPTAINS: #{Navy::Admiral::CAPTAINS.inspect}"
             # Navy.logger.info "Navy::Admiral::OFFICERS: #{Navy::Captain::OFFICERS.inspect}"
             sleep 10
@@ -64,6 +67,15 @@ class Navy::Admiral < Navy::Rank
         }
       }
     }
+    self.after_fork = ->(admiral, captain) do
+      admiral.logger.info("captain=#{captain.label} spawned pid=#{$$}")
+    end
+    self.before_fork = ->(admiral, captain) do
+      admiral.logger.info("captain=#{captain.label} spawning...")
+    end
+    self.before_exec = ->(admiral) do
+      admiral.logger.info("forked child re-executing...")
+    end
   end
 
   def start
@@ -116,7 +128,7 @@ class Navy::Admiral < Navy::Rank
         break
       when :USR1 # rotate logs
         logger.info "admiral reopening logs..."
-        # Unicorn::Util.reopen_logs
+        Navy::Util.reopen_logs
         logger.info "admiral done reopening logs"
         kill_each_captain(:USR1)
       when :USR2 # exec binary, stay alive in case something went wrong
@@ -182,7 +194,7 @@ class Navy::Admiral < Navy::Rank
       if reexec_pid == cpid
         logger.error "reaped #{status.inspect} exec()-ed"
         self.reexec_pid = 0
-        # self.pid = pid.chomp('.oldbin') if pid
+        self.pid = pid.chomp('.oldbin') if pid
         proc_name "admiral"
       else
         captain = CAPTAINS.delete(cpid) rescue nil
@@ -206,19 +218,19 @@ class Navy::Admiral < Navy::Rank
       end
     end
 
-    # if pid
-    #   old_pid = "#{pid}.oldbin"
-    #   begin
-    #     self.pid = old_pid  # clear the path for a new pid file
-    #   rescue ArgumentError
-    #     logger.error "old PID:#{valid_pid?(old_pid)} running with " \
-    #                  "existing pid=#{old_pid}, refusing rexec"
-    #     return
-    #   rescue => e
-    #     logger.error "error writing pid=#{old_pid} #{e.class} #{e.message}"
-    #     return
-    #   end
-    # end
+    if pid
+      old_pid = "#{pid}.oldbin"
+      begin
+        self.pid = old_pid  # clear the path for a new pid file
+      rescue ArgumentError
+        logger.error "old PID:#{valid_pid?(old_pid)} running with " \
+                     "existing pid=#{old_pid}, refusing rexec"
+        return
+      rescue => e
+        logger.error "error writing pid=#{old_pid} #{e.class} #{e.message}"
+        return
+      end
+    end
 
     logger.info "reexec admiral"
 
@@ -230,7 +242,7 @@ class Navy::Admiral < Navy::Rank
       # exec(command, hash) works in at least 1.9.1+, but will only be
       # required in 1.9.4/2.0.0 at earliest.
       logger.info "executing #{cmd.inspect} (in #{Dir.pwd})"
-      # before_exec.call(self)
+      before_exec.call(self)
       exec(*cmd)
     end
     proc_name 'admiral (old)'
@@ -240,9 +252,11 @@ class Navy::Admiral < Navy::Rank
     captains.each do |label, config|
       CAPTAINS.value?(label) and next
       captain = Navy::Captain.new(self, label, config)
+      before_fork.call(self, captain) if before_fork
       if pid = fork
         CAPTAINS[pid] = captain
       else
+        after_fork.call(self, captain) if after_fork
         captain.start.join
         exit
       end
@@ -261,7 +275,7 @@ class Navy::Admiral < Navy::Rank
     }
   end
 
-  # delivers a signal to a worker and fails gracefully if the worker
+  # delivers a signal to a captain and fails gracefully if the captain
   # is no longer running.
   def kill_captain(signal, cpid)
     logger.warn "admiral sending #{signal} to #{cpid}"
@@ -270,9 +284,9 @@ class Navy::Admiral < Navy::Rank
     captain = CAPTAINS.delete(cpid) rescue nil
   end
 
-  # delivers a signal to each worker
+  # delivers a signal to each captain
   def kill_each_captain(signal)
-    CAPTAINS.keys.each { |wpid| kill_captain(signal, wpid) }
+    CAPTAINS.keys.each { |cpid| kill_captain(signal, cpid) }
   end
 
   def init_self_pipe!

data/lib/navy/captain.rb

@@ -11,14 +11,24 @@ class Navy::Captain < Navy::Rank
   # list of signals we care about and trap in admiral.
   QUEUE_SIGS = [ :WINCH, :QUIT, :INT, :TERM, :USR1, :USR2, :HUP, :TTIN, :TTOU ]
 
-  attr_accessor :label, :captain_pid, :timeout, :reexec_pid, :number
+  attr_accessor :label, :captain_pid, :timeout, :number
   attr_reader :admiral, :options
 
   def initialize(admiral, label, options = {})
     @admiral, @options = admiral, options.dup
     @label = label
-    @number = 1
+    @number = @options[:number] || 1
     @timeout = 15
+    # self.pid = "/tmp/navy-#{label}.pid"
+    self.after_fork = ->(captain, officer) do
+      captain.logger.info("(#{captain.label}) officer=#{officer.number} spawned pid=#{$$}")
+    end
+    self.before_fork = ->(captain, officer) do
+      captain.logger.info("(#{captain.label}) officer=#{officer.number} spawning...")
+    end
+    self.before_exec = ->(captain) do
+      captain.logger.info("forked child re-executing...")
+    end
   end
 
   def ==(other_label)
@@ -66,7 +76,7 @@ class Navy::Captain < Navy::Rank
         break
       when :USR1 # rotate logs
         logger.info "captain[#{label}] reopening logs..."
-        # Unicorn::Util.reopen_logs
+        Navy::Util.reopen_logs
         logger.info "captaion[#{label}] done reopening logs"
         kill_each_officer(:USR1)
       when :WINCH
@@ -134,7 +144,7 @@ class Navy::Captain < Navy::Rank
         proc_name "captain[#{label}]"
       else
         officer = OFFICERS.delete(opid) rescue nil
-        m = "reaped #{status.inspect} officer=#{officer.number rescue 'unknown'}"
+        m = "reaped #{status.inspect} (#{label}) officer=#{officer.number rescue 'unknown'}"
         status.success? ? logger.info(m) : logger.error(m)
       end
     rescue Errno::ECHILD
@@ -147,9 +157,11 @@ class Navy::Captain < Navy::Rank
     until (n += 1) == @number
       OFFICERS.value?(n) and next
       officer = Navy::Officer.new(self, n, options[:job])
+      before_fork.call(self, officer) if before_fork
       if pid = fork
         OFFICERS[pid] = officer
       else
+        after_fork.call(self, officer) if after_fork
         officer.start
         exit
       end
@@ -168,7 +180,7 @@ class Navy::Captain < Navy::Rank
     }
   end
 
-  # delivers a signal to a worker and fails gracefully if the worker
+  # delivers a signal to a officer and fails gracefully if the officer
   # is no longer running.
   def kill_officer(signal, opid)
     logger.warn "captain[#{label}] sending #{signal} to #{opid}"
@@ -177,9 +189,9 @@ class Navy::Captain < Navy::Rank
     officer = OFFICERS.delete(opid) rescue nil
   end
 
-  # delivers a signal to each worker
+  # delivers a signal to each officer
   def kill_each_officer(signal)
-    OFFICERS.keys.each { |wpid| kill_officer(signal, wpid) }
+    OFFICERS.keys.each { |opid| kill_officer(signal, opid) }
   end
 
   def init_self_pipe!

data/lib/navy/officer.rb

@@ -3,6 +3,7 @@ class Navy::Officer < Navy::Rank
   attr_reader :captain, :job
   def initialize(captain, number, job)
     @captain, @number, @job = captain, number, job
+    # self.pid = "/tmp/navy-#{captain.label}-#{number}.pid"
   end
 
   def ==(other_number)

data/lib/navy/rank.rb

@@ -1,10 +1,64 @@
 class Navy::Rank
+
+  attr_accessor :before_fork, :after_fork, :before_exec
+  attr_accessor :reexec_pid
+  attr_reader :pid
+
   def logger
     Navy.logger
   end
 
+  # sets the path for the PID file of the master process
+  def pid=(path)
+    if path
+      if x = valid_pid?(path)
+        return path if pid && path == pid && x == $$
+        if x == reexec_pid && pid =~ /\.oldbin\z/
+          logger.warn("will not set pid=#{path} while reexec-ed "\
+                      "child is running PID:#{x}")
+          return
+        end
+        raise ArgumentError, "Already running on PID:#{x} " \
+                             "(or pid=#{path} is stale)"
+      end
+    end
+    unlink_pid_safe(pid) if pid
+
+    if path
+      fp = begin
+        tmp = "#{File.dirname(path)}/#{rand}.#$$"
+        File.open(tmp, File::RDWR|File::CREAT|File::EXCL, 0644)
+      rescue Errno::EEXIST
+        retry
+      end
+      fp.syswrite("#$$\n")
+      File.rename(fp.path, path)
+      fp.close
+    end
+    @pid = path
+  end
+
   private
 
+  # unlinks a PID file at given +path+ if it contains the current PID
+  # still potentially racy without locking the directory (which is
+  # non-portable and may interact badly with other programs), but the
+  # window for hitting the race condition is small
+  def unlink_pid_safe(path)
+    (File.read(path).to_i == $$ and File.unlink(path)) rescue nil
+  end
+
+  # returns a PID if a given path contains a non-stale PID file,
+  # nil otherwise.
+  def valid_pid?(path)
+    wpid = File.read(path).to_i
+    wpid <= 0 and return
+    Process.kill(0, wpid)
+    wpid
+  rescue Errno::ESRCH, Errno::ENOENT, Errno::EPERM
+    # don't unlink stale pid files, racy without non-portable locking...
+  end
+
   def proc_name(tag)
     $0 = ([
       File.basename(Navy::Admiral::START_CTX[0]),
@@ -12,4 +66,9 @@ class Navy::Rank
     ]).concat(Navy::Admiral::START_CTX[:argv]).join(' ')
   end
 
+  def redirect_io(io, path)
+    File.open(path, 'ab') { |fp| io.reopen(fp) } if path
+    io.sync = true
+  end
+
 end

data/lib/navy/util.rb

@@ -0,0 +1,70 @@
+# -*- encoding: binary -*-
+
+module Navy::Util
+
+  extend self
+
+# :stopdoc:
+  def is_log?(fp)
+    append_flags = File::WRONLY | File::APPEND
+
+    ! fp.closed? &&
+      fp.sync &&
+      (fp.fcntl(Fcntl::F_GETFL) & append_flags) == append_flags
+    rescue IOError, Errno::EBADF
+      false
+  end
+
+  def chown_logs(uid, gid)
+    ObjectSpace.each_object(File) do |fp|
+      fp.chown(uid, gid) if is_log?(fp)
+    end
+  end
+# :startdoc:
+
+  # This reopens ALL logfiles in the process that have been rotated
+  # using logrotate(8) (without copytruncate) or similar tools.
+  # A +File+ object is considered for reopening if it is:
+  #   1) opened with the O_APPEND and O_WRONLY flags
+  #   2) the current open file handle does not match its original open path
+  #   3) unbuffered (as far as userspace buffering goes, not O_SYNC)
+  # Returns the number of files reopened
+  #
+  # In Unicorn 3.5.x and earlier, files must be opened with an absolute
+  # path to be considered a log file.
+  def reopen_logs
+    to_reopen = []
+    nr = 0
+    ObjectSpace.each_object(File) { |fp| is_log?(fp) and to_reopen << fp }
+
+    to_reopen.each do |fp|
+      orig_st = begin
+        fp.stat
+      rescue IOError, Errno::EBADF
+        next
+      end
+
+      begin
+        b = File.stat(fp.path)
+        next if orig_st.ino == b.ino && orig_st.dev == b.dev
+      rescue Errno::ENOENT
+      end
+
+      begin
+        File.open(fp.path, 'a') { |tmpfp| fp.reopen(tmpfp) }
+        fp.sync = true
+        new_st = fp.stat
+
+        # this should only happen in the master:
+        if orig_st.uid != new_st.uid || orig_st.gid != new_st.gid
+          fp.chown(orig_st.uid, orig_st.gid)
+        end
+
+        nr += 1
+      rescue IOError, Errno::EBADF
+        # not much we can do...
+      end
+    end
+    nr
+  end
+end

data/lib/navy/version.rb

@@ -1,3 +1,3 @@
 module Navy
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/navy.rb

@@ -21,6 +21,7 @@ module Navy
     exc.backtrace.each { |line| logger.error(line) }
   end
 end
+require 'navy/util'
 require 'navy/rank'
 require 'navy/admiral'
 require 'navy/captain'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-03 00:00:00.000000000 Z
+date: 2012-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70147356922140 !ruby/object:Gem::Requirement
+  requirement: &70128860157040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147356922140
+  version_requirements: *70128860157040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70147356921620 !ruby/object:Gem::Requirement
+  requirement: &70128860156580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147356921620
+  version_requirements: *70128860156580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70147356920800 !ruby/object:Gem::Requirement
+  requirement: &70128860155900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70147356920800
+  version_requirements: *70128860155900
 - !ruby/object:Gem::Dependency
   name: kgio
-  requirement: &70147356920060 !ruby/object:Gem::Requirement
+  requirement: &70128860155160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70147356920060
+  version_requirements: *70128860155160
 description: Ruby daemon inspired by Unicorn.
 email:
 - potatosaladx@gmail.com
@@ -75,6 +75,7 @@ files:
 - lib/navy/officer.rb
 - lib/navy/rank.rb
 - lib/navy/ship.rb
+- lib/navy/util.rb
 - lib/navy/version.rb
 - navy.gemspec
 homepage: https://github.com/potatosalad/navy