navy 0.0.2 → 0.0.3

data/bin/navy

@@ -10,7 +10,13 @@ options      = ship_options[:options]
 
 op = OptionParser.new("", 24, '  ') do |opts|
   cmd = File.basename($0)
-  opts.banner = "Usage: #{cmd} [#{cmd} options]"
+  opts.banner = "Usage: #{cmd} [ruby options] [#{cmd} options]"
+
+  opts.separator "Ruby options:"
+
+  opts.on("-d", "--debug", "set debugging flags (set $DEBUG to true)") do
+    $DEBUG = true
+  end
 
   opts.separator "#{cmd} options:"
 
@@ -52,5 +58,13 @@ end
 #   })
 # end
 
+if $DEBUG
+  require 'pp'
+  pp({
+    navy_options: options,
+    daemonize:    ship_options[:daemonize]
+  })
+end
+
 Navy::Ship.launch!(options) if ship_options[:daemonize]
 Navy::Admiral.new(options).start.join

data/lib/navy/admiral.rb

@@ -82,7 +82,7 @@ class Navy::Admiral < Navy::Rank
     init_self_pipe!
     QUEUE_SIGS.each do |sig|
       trap(sig) do
-        logger.warn "admiral received #{sig}"
+        logger.debug "admiral received #{sig}" if $DEBUG
         SIG_QUEUE << sig
         awaken_admiral
       end
@@ -114,7 +114,7 @@ class Navy::Admiral < Navy::Rank
         # machine) comes out of suspend/hibernation
         if (last_check + @timeout) >= (last_check = Time.now)
           # sleep_time = murder_lazy_workers
-          logger.debug("would normally murder lazy captains")
+          logger.debug("would normally murder lazy captains") if $DEBUG
         else
           sleep_time = @timeout/2.0 + 1
           logger.debug("waiting #{sleep_time}s after suspend/hibernation")
@@ -278,7 +278,7 @@ class Navy::Admiral < Navy::Rank
   # 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}"
+    logger.debug "admiral sending #{signal} to #{cpid}" if $DEBUG
     Process.kill(signal, cpid)
   rescue Errno::ESRCH
     captain = CAPTAINS.delete(cpid) rescue nil

data/lib/navy/captain.rb

@@ -37,7 +37,13 @@ class Navy::Captain < Navy::Rank
 
   def start
     init_self_pipe!
-    QUEUE_SIGS.each { |sig| trap(sig) { SIG_QUEUE << sig; awaken_captain } }
+    QUEUE_SIGS.each do |sig|
+      trap(sig) do
+        logger.debug "captain[#{label}] received #{sig}" if $DEBUG
+        SIG_QUEUE << sig
+        awaken_captain
+      end
+    end
     trap(:CHLD) { awaken_captain }
 
     logger.info "captain[#{label}] starting"
@@ -62,7 +68,7 @@ class Navy::Captain < Navy::Rank
         # machine) comes out of suspend/hibernation
         if (last_check + @timeout) >= (last_check = Time.now)
           # sleep_time = murder_lazy_workers
-          logger.debug("would normally murder lazy officers")
+          logger.debug("would normally murder lazy officers") if $DEBUG
         else
           sleep_time = @timeout/2.0 + 1
           logger.debug("waiting #{sleep_time}s after suspend/hibernation")
@@ -183,7 +189,7 @@ class Navy::Captain < Navy::Rank
   # 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}"
+    logger.debug "captain[#{label}] sending #{signal} to #{opid}" if $DEBUG
     Process.kill(signal, opid)
   rescue Errno::ESRCH
     officer = OFFICERS.delete(opid) rescue nil

data/lib/navy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70128860157040 !ruby/object:Gem::Requirement
+  requirement: &70181829400440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70128860157040
+  version_requirements: *70181829400440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70128860156580 !ruby/object:Gem::Requirement
+  requirement: &70181829399700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70128860156580
+  version_requirements: *70181829399700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70128860155900 !ruby/object:Gem::Requirement
+  requirement: &70181829398740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70128860155900
+  version_requirements: *70181829398740
 - !ruby/object:Gem::Dependency
   name: kgio
-  requirement: &70128860155160 !ruby/object:Gem::Requirement
+  requirement: &70181829398120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70128860155160
+  version_requirements: *70181829398120
 description: Ruby daemon inspired by Unicorn.
 email:
 - potatosaladx@gmail.com