einhorn 0.5.5 → 0.5.6

data/bin/einhornsh

@@ -66,7 +66,8 @@ module Einhorn
         raise EinhornSHExit
       end
       send_command({'id' => request_id, 'command' => command, 'args' => args}) do |message|
-        puts message
+        $stdout.puts message
+        $stdout.flush
       end
     end
 
@@ -169,7 +170,7 @@ with a `-d`, provide the same argument here."
     path_to_socket = Einhorn::Command::Interface.default_socket_path(cmd_name)
   end
 
-  sh = Einhorn::EinhornSH.new(path_to_socket)  
+  sh = Einhorn::EinhornSH.new(path_to_socket)
 
   cmd_line_seq = options[:cmd_line_seq]
 

data/lib/einhorn/command.rb

@@ -39,11 +39,11 @@ module Einhorn
 
       case type = spec[:type]
       when :worker
-        Einhorn.log_info("===> Exited worker #{pid.inspect}#{extra}")
+        Einhorn.log_info("===> Exited worker #{pid.inspect}#{extra}", :upgrade)
       when :state_passer
-        Einhorn.log_debug("===> Exited state passing process #{pid.inspect}")
+        Einhorn.log_debug("===> Exited state passing process #{pid.inspect}", :upgrade)
       else
-        Einhorn.log_error("===> Exited process #{pid.inspect} has unrecgonized type #{type.inspect}: #{spec.inspect}")
+        Einhorn.log_error("===> Exited process #{pid.inspect} has unrecgonized type #{type.inspect}: #{spec.inspect}", :upgrade)
       end
     end
 
@@ -102,17 +102,17 @@ module Einhorn
       children ||= Einhorn::WorkerPool.workers
 
       signaled = []
-      Einhorn.log_info("Sending #{signal} to #{children.inspect}")
+      Einhorn.log_info("Sending #{signal} to #{children.inspect}", :upgrade)
 
       children.each do |child|
         unless spec = Einhorn::State.children[child]
-          Einhorn.log_error("Trying to send #{signal} to dead child #{child.inspect}. The fact we tried this probably indicates a bug in Einhorn.")
+          Einhorn.log_error("Trying to send #{signal} to dead child #{child.inspect}. The fact we tried this probably indicates a bug in Einhorn.", :upgrade)
           next
         end
 
         if record
           if spec[:signaled].include?(signal)
-            Einhorn.log_error("Re-sending #{signal} to already-signaled child #{child.inspect}. It may be slow to spin down, or it may be swallowing #{signal}s.")
+            Einhorn.log_error("Re-sending #{signal} to already-signaled child #{child.inspect}. It may be slow to spin down, or it may be swallowing #{signal}s.", :upgrade)
           end
           spec[:signaled].add(signal)
         end
@@ -256,7 +256,7 @@ module Einhorn
         end
       end
 
-      Einhorn.log_info("===> Launched #{pid}")
+      Einhorn.log_info("===> Launched #{pid}", :upgrade)
       Einhorn::State.children[pid] = {
         :type => :worker,
         :version => Einhorn::State.version,
@@ -400,17 +400,17 @@ module Einhorn
       old_workers = Einhorn::WorkerPool.old_workers
       Einhorn.log_debug("#{acked} acked, #{unsignaled} unsignaled, #{target} target, #{old_workers.length} old workers")
       if !Einhorn::State.upgrading && old_workers.length > 0
-        Einhorn.log_info("Killing off #{old_workers.length} old workers.")
+        Einhorn.log_info("Killing off #{old_workers.length} old workers.", :upgrade)
         signal_all("USR2", old_workers)
       elsif Einhorn::State.upgrading && Einhorn::State.smooth_upgrade
         # In a smooth upgrade, kill off old workers one by one when we have
         # sufficiently many new workers.
         excess = (old_workers.length + acked) - target
         if excess > 0
-          Einhorn.log_info("Smooth upgrade: killing off #{excess} old workers.")
+          Einhorn.log_info("Smooth upgrade: killing off #{excess} old workers.", :upgrade)
           signal_all("USR2", old_workers.take(excess))
         elsif excess < 0
-          Einhorn.log_error("Smooth upgrade: somehow excess is #{excess}!")
+          Einhorn.log_error("Smooth upgrade: somehow excess is #{excess}!", :upgrade)
         end
       end
 
@@ -478,7 +478,7 @@ module Einhorn
           msg = "Last spinup was #{seconds_ago}s ago, and spinup_interval is #{spinup_interval}s, so spinning up a new process"
 
           if Einhorn::State.consecutive_deaths_before_ack > 0
-            Einhorn.log_info("#{msg} (there have been #{Einhorn::State.consecutive_deaths_before_ack} consecutive unacked worker deaths)")
+            Einhorn.log_info("#{msg} (there have been #{Einhorn::State.consecutive_deaths_before_ack} consecutive unacked worker deaths)", :upgrade)
           else
             Einhorn.log_debug(msg)
           end

data/lib/einhorn/version.rb

@@ -1,3 +1,3 @@
 module Einhorn
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end

data/lib/einhorn.rb

@@ -168,8 +168,9 @@ module Einhorn
   end
 
   # Implement these ourselves so it plays nicely with state persistence
-  def self.log_debug(msg)
+  def self.log_debug(msg, tag=nil)
     $stderr.puts("#{log_tag} DEBUG: #{msg}") if Einhorn::State.verbosity <= 0
+    self.send_tagged_message(tag, msg) if tag
   end
   def self.log_info(msg, tag=nil)
     $stderr.puts("#{log_tag} INFO: #{msg}") if Einhorn::State.verbosity <= 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: einhorn
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -166,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -690549708583071819
+      hash: -2873954184645788574
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -690549708583071819
+      hash: -2873954184645788574
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23