einhorn 0.5.0 → 0.5.1

data/CONTRIBUTORS

@@ -0,0 +1,6 @@
+Greg Brockman <gdb@stripe.com>
+Evan Broder <evan@stripe.com>
+Nelson Elhage <nelhage@stripe.com>
+Paul Hammond <paul@paulhammond.org>
+Conrad Irwin <conrad.irwin@gmail.com>
+Max Wang <max@stripe.com>

data/Gemfile

@@ -1,4 +1,8 @@
-source 'https://rubygems.org'
+# Execute bundler hook if present
+['~/.', '/etc/'].any? do |file|
+ File.lstat(path = File.expand_path(file + 'bundle-gemfile-hook')) rescue next
+ eval(File.read(path), binding, path); break true
+end || source('https://rubygems.org/')
 
 # Specify your gem's dependencies in einhorn.gemspec
 gemspec

data/Rakefile

@@ -20,3 +20,15 @@ end
 
 task :default => :test do
 end
+require 'bundler/setup'
+require 'chalk-rake/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs = ['lib']
+  # t.warning = true
+  t.verbose = true
+  t.test_files = FileList['test/**/*.rb'].reject do |file|
+    file.end_with?('_lib.rb') || file.include?('/_lib/')
+  end
+end

data/bin/einhornsh

@@ -11,6 +11,9 @@ require 'einhorn'
 module Einhorn
   class EinhornSH
 
+    class EinhornSHExit < StandardError
+    end
+
     def initialize(path_to_socket)
       @path_to_socket = path_to_socket
       @request_id = 0
@@ -42,15 +45,28 @@ module Einhorn
       emit
       emit('Type "quit" or "exit" to quit at any time')
 
-      while line = Readline.readline('> ', true)
-        command, args = parse_command(line)
-        if ['quit', 'exit'].include?(command)
-          emit("Goodbye!")
-          return
-        end
-        send_command({'id' => request_id, 'command' => command, 'args' => args}) do |message|
-          puts message
-        end
+      while command_line_sequence = Readline.readline('> ', true)
+        run_command_line_sequence(command_line_sequence)
+      end
+    end
+
+    def run_command_line_sequence(command_line_sequence)
+      command_lines = command_line_sequence.split(";")
+      command_lines.each do |command_line|
+        run_command_line(command_line)
+      end
+    end
+
+    def run_command_line(command_line)
+      command, args = parse_command_line(command_line)
+      if command.nil?
+        return
+      elsif ['quit', 'exit'].include?(command)
+        emit("Goodbye!")
+        raise EinhornSHExit
+      end
+      send_command({'id' => request_id, 'command' => command, 'args' => args}) do |message|
+        puts message
       end
     end
 
@@ -58,8 +74,8 @@ module Einhorn
       @request_id += 1
     end
 
-    def parse_command(line)
-      command, *args = Shellwords.shellsplit(line)
+    def parse_command_line(command_line)
+      command, *args = Shellwords.shellsplit(command_line)
       [command, args]
     end
 
@@ -128,6 +144,11 @@ with a `-d`, provide the same argument here."
     opts.on('-d PATH', '--socket-path PATH', 'Path to the Einhorn command socket') do |path|
       options[:socket_path] = path
     end
+
+    opts.on('-e CMD_LINE_SEQ', '--execute CMD_LINE_SEQ', 'Execute this command outside of interactive mode') do |cmd_line_seq|
+      options[:cmd_line_seq] = cmd_line_seq
+    end
+
   end
   optparse.parse!
 
@@ -148,8 +169,16 @@ 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.run
+  sh = Einhorn::EinhornSH.new(path_to_socket)  
+
+  cmd_line_seq = options[:cmd_line_seq]
+
+  begin
+    cmd_line_seq ? sh.run_command_line_sequence(cmd_line_seq) : sh.run
+  rescue Einhorn::EinhornSH::EinhornSHExit => e
+    return 0
+  end
+
   return 0
 end
 

data/einhorn.gemspec

@@ -2,18 +2,22 @@
 require File.expand_path('../lib/einhorn/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Greg Brockman"]
-  gem.email         = ["gdb@stripe.com"]
-  gem.summary       = "Einhorn: the language-independent shared socket manager"
-  gem.description   = "Einhorn makes it easy to run multiple instances of an application server, all listening on the same port. You can also seamlessly restart your workers without dropping any requests. Einhorn requires minimal application-level support, making it easy to use with an existing project."
-  gem.homepage      = "https://github.com/stripe/einhorn"
-  gem.license       = "MIT"
+  gem.authors       = ['Greg Brockman']
+  gem.email         = ['gdb@stripe.com']
+  gem.summary       = 'Einhorn: the language-independent shared socket manager'
+  gem.description   = 'Einhorn makes it easy to run multiple instances of an application server, all listening on the same port. You can also seamlessly restart your workers without dropping any requests. Einhorn requires minimal application-level support, making it easy to use with an existing project.'
+  gem.homepage      = 'https://github.com/stripe/einhorn'
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "einhorn"
-  gem.require_paths = ["lib"]
+  gem.name          = 'einhorn'
+  gem.require_paths = ['lib']
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'mocha'
+  gem.add_development_dependency 'chalk-rake'
 
   gem.add_development_dependency('rake')
   gem.add_development_dependency('minitest', '< 5.0')

data/lib/einhorn/command.rb

@@ -319,6 +319,7 @@ module Einhorn
 
     def self.cull
       acked = Einhorn::WorkerPool.ack_count
+      unsignaled = Einhorn::WorkerPool.unsignaled_count
       target = Einhorn::WorkerPool.ack_target
 
       if Einhorn::State.upgrading && acked >= target
@@ -333,8 +334,8 @@ module Einhorn
         signal_all("USR2", old_workers)
       end
 
-      if acked > target
-        excess = Einhorn::WorkerPool.acked_unsignaled_modern_workers[0...(acked-target)]
+      if unsignaled > target
+        excess = Einhorn::WorkerPool.unsignaled_modern_workers_with_priority[0...(unsignaled-target)]
         Einhorn.log_info("Have too many workers at the current version, so killing off #{excess.length} of them.")
         signal_all("USR2", excess)
       end

data/lib/einhorn/version.rb

@@ -1,3 +1,3 @@
 module Einhorn
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/einhorn/worker_pool.rb

@@ -34,12 +34,24 @@ module Einhorn
       acked_modern_workers_with_state.map {|pid, _| pid}
     end
 
+    def self.unsignaled_modern_workers_with_state
+      modern_workers_with_state.select do |_, spec|
+        spec[:signaled].length == 0
+      end
+    end
+
     def self.acked_unsignaled_modern_workers
       acked_modern_workers_with_state.select do |_, spec|
         spec[:signaled].length == 0
       end.map {|pid, _| pid}
     end
 
+    def self.unsignaled_modern_workers_with_priority
+      unsignaled_modern_workers_with_state.sort_by do |pid, spec|
+        spec[:acked] ? 1 : 0
+      end.map {|pid, _| pid}
+    end
+
     # Use the number of modern workers, rather than unsignaled modern
     # workers. This means if e.g. we do bunch of decs and then incs,
     # any workers which haven't died yet will count towards our number
@@ -59,6 +71,10 @@ module Einhorn
       Einhorn::State.config[:number]
     end
 
+    def self.unsignaled_count
+      unsignaled_modern_workers_with_state.length
+    end
+
     def self.old_workers
       unsignaled_workers - modern_workers
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: einhorn
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: chalk-rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +137,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CONTRIBUTORS
 - Gemfile
 - History.txt
 - LICENSE
@@ -132,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3689317997291483105
+      hash: -4058700174817085581
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3689317997291483105
+      hash: -4058700174817085581
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23