eye-patch 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8281021f4db405a7011e70f5ea0f01aa0b1afc3
-  data.tar.gz: 4ac4ff0e9c9b16f55912ffe1a885af3d424e6819
+  metadata.gz: 0232e86740d9e98145bf1f3270abdc9d7b5ef320
+  data.tar.gz: f007dccd24e1e8eb08739dd416a15d1389721514
 SHA512:
-  metadata.gz: 9f58bfc30efef715e657c4c76611f9eda3040fa7ae8ebba0ca0c3b5f84ec997ddc65be39bf80ecb101ae2983f215a087106a8ee04c9e144df1daa6715bdf29a6
-  data.tar.gz: 667974afe57844d67faadc9ecc7bcd4926b19d982285d525f92c181224ef081c012a208da434dad5a2afea309dd6b4689371ce0f6faa9fc17972fc653cdebefa
+  metadata.gz: fcdd3a0bdd31ecd1bafd14f4b46ba78d479aa90d64da8fc41fe99415a571eea5a466a05997b8f97ae7f964335a6378a90fc5267f1a19f3d7ed8a1f3c8b149704
+  data.tar.gz: d10ee77be22ffbe61648c680a44b89563e19aeb3e01590b90060fd9e5e8f47e7d05867abd9ecca97165e71aa6a79254dc4dbed5d42001a67e9330f4060377c1b

data/README.md

@@ -168,6 +168,12 @@ Note that if you _do_ need to persist file descriptors for a daemonized process,
 
 Note also that since Ruby 2.0, file descriptors are closed when a process is invoked through `bundle exec`. From versions 1.5 and above, you can pass the `--keep-file-descriptors` flag to `bundle exec` to prevent this behavior.
 
+#### Managing Pidfiles
+
+By default, `eye` will attempt to manage the pidfile for any process with the `daemonize: true` flag. In certain cases, this may be undesirable. For example, [`unicorn`](https://github.com/defunkt/unicorn) attempts to manage its own pid, which is necessary for zero-downtime deploys.
+
+To get around this problem, you can supply the `smart_pid: true` option in a process's config hash. This will instruct eye to trust the daemonized process to manage its own pid.
+
 ### Running Locally
 
 You can test your configurations locally by running the `eye-patch` binary like so:

data/lib/eye/patch/overrides.rb

@@ -7,6 +7,53 @@ Eye::Cli.class_eval do
   end
 end
 
+require "eye/utils/mini_active_support"
+Eye::Process.class_eval do
+
+  def daemonize_process
+    time_before = Time.now
+    res = Eye::System.daemonize(self[:start_command], config)
+    start_time = Time.now - time_before
+
+    info "daemonizing: `#{self[:start_command]}` with start_grace: #{self[:start_grace].to_f}s, env: #{self[:environment].inspect}, working_dir: #{self[:working_dir]}, <#{res[:pid]}>"
+
+    if res[:error]
+
+      if res[:error].message == 'Permission denied - open'
+        error "daemonize failed with #{res[:error].inspect}; make sure #{[self[:stdout], self[:stderr]]} are writable"
+      else
+        error "daemonize failed with #{res[:error].inspect}"
+      end
+
+      return {:error => res[:error].inspect}
+    end
+
+    self.pid = res[:pid]
+
+    unless self.pid
+      error 'no pid was returned'
+      return {:error => :empty_pid}
+    end
+
+    sleep_grace(:start_grace)
+
+    unless process_really_running?
+      error "process <#{self.pid}> not found, it may have crashed (#{check_logs_str})"
+      return {:error => :not_really_running}
+    end
+
+    unless !self[:smart_pid] && failsafe_save_pid
+      return {:error => :cant_write_pid}
+    end
+
+    res
+  end
+
+  def control_pid?
+    !!self[:daemonize] && !self[:smart_pid]
+  end
+end
+
 Eye::System.class_eval do
   class << self
     alias_method :daemonize_without_hook, :daemonize

data/lib/eye/patch/version.rb

@@ -1,5 +1,5 @@
 module Eye
   module Patch
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye-patch
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eye