einhorn 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf1c281da283b0ee43ed8cbaeddb906c1804a28a4cbbbb48fd6d7ec9840491a6
-  data.tar.gz: 18642e07afb648a5d00e0b9006f9331496353ca719928a50a2c1cf340372c6cd
+  metadata.gz: c27575ecf4150906398eb1b48506bc91a1891ea6bc861ec3b26a3bd7338a1c9d
+  data.tar.gz: 31729bfe873c278e617e0e06ba4c7eb0bc48610a462e2d1e735cb3633b3b714f
 SHA512:
-  metadata.gz: 7660f7388e99b82efb48444ffeebfc776b3a3df2f51a4f87e56b85381cbe1993958601dd2c24a88438755074952c6b326ce1ba895d1c769924e028ca98b90bff
-  data.tar.gz: 876641c4e3e32668aca676c0636786c2dfd2ed1d4d0cc5b9fc33bf01c9d1c6c60d128719deb7a98f20432fbd7982069bdc8cb52bff59b7a73a6dbf7379f09973
+  metadata.gz: c1e19de40ef6ba91c7ca05fdfd48224f841885ef1b93180ce48fdb47ba217f72573548d8de37b30e63dc9edfeacaf82d72201cbdbd43366cdef7c4c4bb639ffd
+  data.tar.gz: db21b2aa478724ffa0cc6ff690c5dd4d51592bfe1a8432f01f89b6b63640aeaf24257e90a929efe96efa6b178877d9f957505732a83a489676490f99dd3f57d6

data/Changes.md

@@ -1,3 +1,16 @@
+# 1.1.1
+
+- Fix a few Ruby deprecations
+- Use `Process.warmup` with `--gc-before-fork`
+
+# 1.1.0
+
+- Add `logger` and `readline` gem dependencies for Ruby 4.0
+- Make the `fiddle` gem dependency optional.
+  This gem is only necessary if you use the `-k` flag and since
+  it is native, requires libffi and a compiler to be installed.
+  Add `gem "fiddle"` to your Gemfile to use the `-k` flag.
+
 # 1.0.1
 
 - Add `fiddle` to gemspec dependencies [#111]

data/README.md

@@ -200,7 +200,7 @@ Then you could set `--reexec-as=` to the name of your bash script and it will ru
     -f, --lockfile LOCKFILE          Where to store the Einhorn lockfile
     -g, --command-socket-as-fd       Leave the command socket open as a file descriptor, passed in the EINHORN_SOCK_FD environment variable. This allows your worker processes to ACK without needing to know where on the filesystem the command socket lives.
     -h, --help                       Display this message
-    -k, --kill-children-on-exit      If Einhorn exits unexpectedly, gracefully kill all its children
+    -k, --kill-children-on-exit      If Einhorn exits unexpectedly, gracefully kill all its children (linux only, requires the fiddle gem)
     -l, --backlog N                  Connection backlog (assuming this is a server)
     -m, --ack-mode MODE              What kinds of ACK to expect from workers. Choices: FLOAT (number of seconds until assumed alive), manual (process will speak to command socket when ready). Default is MODE=1.
     -n, --number N                   Number of copies to spin up

data/bin/einhorn

@@ -227,6 +227,14 @@ if true # $0 == __FILE__
     end
 
     opts.on('-k', '--kill-children-on-exit', 'If Einhorn exits unexpectedly, gracefully kill all its children') do
+      # Fiddle is only necessary for this feature flag.
+      # Since fiddle is our only native dependency and we don't want to force
+      # a compiler on everyone, we make it optional.
+      begin
+        require "fiddle"
+      rescue LoadError
+        warn "Please add `gem 'fiddle'` to your Gemfile to use einhorn's -k flag"
+      end
       Einhorn::State.kill_children_on_exit = true
     end
 

data/einhorn.gemspec

@@ -25,5 +25,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "minitest", "~> 5"
   gem.add_development_dependency "mocha", "~> 2"
   gem.add_development_dependency "subprocess", "~> 1"
-  gem.add_dependency "fiddle", "~> 1.1"
+  # Fiddle is native and only needed for `-k` on Linux so we make it optional
+  # gem.add_dependency "fiddle", "~> 1.1"
+  gem.add_dependency "logger"
+  gem.add_dependency "readline"
 end

data/lib/einhorn/command/interface.rb

@@ -297,7 +297,7 @@ module Einhorn::Command
     # Used by einhornsh
     command "ehlo" do |conn, request|
       <<~EOF
-        Welcome, #{request["user"]}! You are speaking to Einhorn Master Process #{$$}#{Einhorn::State.cmd_name ? " (#{Einhorn::State.cmd_name})" : ""}.
+        Welcome, #{request["user"]}! You are speaking to Einhorn Master Process #{$$}#{" (#{Einhorn::State.cmd_name})" if Einhorn::State.cmd_name}.
         This is Einhorn #{Einhorn::VERSION}.
       EOF
     end

data/lib/einhorn/event/abstract_text_descriptor.rb

@@ -15,7 +15,7 @@ module Einhorn::Event
       @socket = sock
       @client_id = "#{@@instance_counter}:#{sock.fileno}"
 
-      @read_buffer = ""
+      @read_buffer = +""
       @write_buffer = +""
 
       @closed = false
@@ -113,7 +113,7 @@ module Einhorn::Event
 
     # Override in subclass. This lets you do streaming reads.
     def parse_record
-      [@read_buffer, ""]
+      [@read_buffer, +""]
     end
 
     def consume_record(record)

data/lib/einhorn/prctl_linux.rb

@@ -4,6 +4,7 @@ require "fiddle/import"
 module Einhorn
   module PrctlRaw
     extend Fiddle::Importer
+
     dlload Fiddle.dlopen(nil) # libc
     extern "int prctl(int, unsigned long, unsigned long, unsigned long, unsigned long)"
 

data/lib/einhorn/version.rb

@@ -1,3 +1,3 @@
 module Einhorn
-  VERSION = "1.0.1"
+  VERSION = "1.1.1"
 end

data/lib/einhorn.rb

@@ -94,6 +94,7 @@ module Einhorn
 
   module TransientState
     extend AbstractState
+
     def self.default_state
       {
         whatami: :master,
@@ -255,7 +256,13 @@ module Einhorn
           log_info("Requiring #{path} (if this hangs, make sure your code can be properly loaded as a library)", :upgrade)
           require path
 
-          force_move_to_oldgen if Einhorn::State.config[:gc_before_fork]
+          if Einhorn::State.config[:gc_before_fork]
+            if Process.respond_to?(:warmup)
+              Process.warmup
+            else
+              force_move_to_oldgen
+            end
+          end
         end
       rescue StandardError, LoadError => e
         log_info("Proceeding with postload -- could not load #{path}: #{e} (#{e.class})\n  #{e.backtrace.join("\n  ")}", :upgrade)
@@ -307,7 +314,7 @@ module Einhorn
     end
 
     ARGV[0..-1] = cmd[idx + 1..-1]
-    log_info("Set#{set_ps_name ? " $0 = #{$0.inspect}, " : nil} ARGV = #{ARGV.inspect}")
+    log_info("Set#{" $0 = #{$0.inspect}, " if set_ps_name} ARGV = #{ARGV.inspect}")
   end
 
   def self.set_master_ps_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: einhorn
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Stripe
 - Mike Perham
 bindir: bin
 cert_chain: []
-date: 2025-04-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -67,19 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: fiddle
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 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
@@ -143,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.6
 specification_version: 4
 summary: 'Einhorn: the language-independent shared socket manager'
 test_files: []