foreman 0.83.0 → 0.84.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b47f2299ea8053d5c06ff2676d7839799a9d0cf
-  data.tar.gz: 50e387ed25b8bb71b62ef69107d2d44022dc6f89
+  metadata.gz: 07592e3ada2314429eef1c9e1c0ba6bece95ab7e
+  data.tar.gz: 445fb48e93a2447988598b2db0f60a78c1991b14
 SHA512:
-  metadata.gz: 827d667ac814592eb0b20d719e5997ab716a859a9bcc93f9a3fb62b1ddcd225af7f29650c6ea798a73f472be471fbeca3dd08154a0674f25aa88b2e0694f994a
-  data.tar.gz: a4620d3b6937fe56caf2040ff9a7d982fa2e15d20cd85d031a356fb0284a68de78be736b336689dcf8e9cd5b78d2646c64a791d347f28a74f906124c8017ab19
+  metadata.gz: 546d1fb8701f569b96ba69885e6d390385abe15a309ffbe5a03a68a4cd074a878a0ba06d7dbe7f15bf0399e72c6c72097c8bfa10f94a8552b875787a9e88f1dd
+  data.tar.gz: d3a0b59f02ef1203f8cb4e8b354a789182cb7eaa9afd053a17bba0450f9f34ff03b287b410be514f8a759d9a7295ee080e14d75f073be65abc8281f5cd90c1f6

data/data/export/supervisord/app.conf.erb

@@ -17,7 +17,6 @@ engine.each_process do |name, process|
 command=<%= process.command %>
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=<%= log %>/<%= name %>-<%= num %>.log
 stderr_logfile=<%= log %>/<%= name %>-<%= num %>.error.log
 user=<%= user %>

data/data/export/systemd/process.service.erb

@@ -5,8 +5,10 @@ PartOf=<%= app %>-<%= name %>.target
 User=<%= user %>
 WorkingDirectory=<%= engine.root %>
 Environment=PORT=%i
-<% if !engine.env.empty? -%>Environment=<% engine.env.each_pair do |var,env| %>"<%= var.upcase %>=<%= env %>" <% end %><% end -%>
-ExecStart=/bin/bash -lc '<%= process.command %>'
+<% engine.env.each_pair do |var,env| -%>
+Environment="<%= var.upcase %>=<%= env %>"
+<% end -%>
+ExecStart=/bin/bash -lc 'exec <%= process.command %>'
 Restart=always
 StandardInput=null
 StandardOutput=syslog

data/lib/foreman/engine.rb

@@ -10,7 +10,7 @@ class Foreman::Engine
 
   # The signals that the engine cares about.
   #
-  HANDLED_SIGNALS = [ :TERM, :INT, :HUP ]
+  HANDLED_SIGNALS = [ :TERM, :INT, :HUP, :USR1, :USR2 ]
 
   attr_reader :env
   attr_reader :options
@@ -104,6 +104,8 @@ class Foreman::Engine
       handle_interrupt
     when :HUP
       handle_hangup
+    when *HANDLED_SIGNALS
+      handle_signal_forward(sig)
     else
       system "unhandled signal #{sig}"
     end
@@ -130,6 +132,11 @@ class Foreman::Engine
     @shutdown = true
   end
 
+  def handle_signal_forward(signal)
+    system "#{signal} received, forwarding it to children"
+    kill_children signal
+  end
+
   # Register a process to be run by this +Engine+
   #
   # @param [String] name     A name for this process

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.83.0"
+  VERSION = "0.84.0"
 
 end

data/man/foreman.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FOREMAN" "1" "January 2017" "Foreman 0.83.0" "Foreman Manual"
+.TH "FOREMAN" "1" "January 2017" "Foreman 0.84.0" "Foreman Manual"
 .
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications

data/spec/foreman/export/systemd_spec.rb

@@ -60,6 +60,12 @@ describe Foreman::Export::Systemd, :fakefs do
     expect(File.read("/tmp/init/app-alpha@.service")).to match(/KEY=some "value"/)
   end
 
+  it "includes ExecStart line" do
+    engine.env['KEY'] = 'some "value"'
+    systemd.export
+    expect(File.read("/tmp/init/app-alpha@.service")).to match(/^ExecStart=/)
+  end
+
   context "with a formation" do
     let(:formation) { "alpha=2" }
 

data/spec/resources/export/supervisord/app-alpha-1.conf

@@ -2,7 +2,6 @@
 command=./alpha
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=/var/log/app/alpha-1.log
 stderr_logfile=/var/log/app/alpha-1.error.log
 user=app
@@ -13,7 +12,6 @@ environment=FOO="bar",URL="http://example.com/api?foo=bar&baz=1",PORT="5000"
 command=./bravo
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=/var/log/app/bravo-1.log
 stderr_logfile=/var/log/app/bravo-1.error.log
 user=app
@@ -24,7 +22,6 @@ environment=FOO="bar",URL="http://example.com/api?foo=bar&baz=1",PORT="5100"
 command=./foo_bar
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=/var/log/app/foo_bar-1.log
 stderr_logfile=/var/log/app/foo_bar-1.error.log
 user=app
@@ -35,7 +32,6 @@ environment=FOO="bar",URL="http://example.com/api?foo=bar&baz=1",PORT="5200"
 command=./foo-bar
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=/var/log/app/foo-bar-1.log
 stderr_logfile=/var/log/app/foo-bar-1.error.log
 user=app

data/spec/resources/export/supervisord/app-alpha-2.conf

@@ -2,7 +2,6 @@
 command=./alpha
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=/var/log/app/alpha-1.log
 stderr_logfile=/var/log/app/alpha-1.error.log
 user=app
@@ -13,7 +12,6 @@ environment=PORT="5000"
 command=./alpha
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=/var/log/app/alpha-2.log
 stderr_logfile=/var/log/app/alpha-2.error.log
 user=app

data/spec/resources/export/systemd/app-alpha@.service

@@ -5,7 +5,7 @@ PartOf=app-alpha.target
 User=app
 WorkingDirectory=/tmp/app
 Environment=PORT=%i
-ExecStart=/bin/bash -lc './alpha'
+ExecStart=/bin/bash -lc 'exec ./alpha'
 Restart=always
 StandardInput=null
 StandardOutput=syslog

data/spec/resources/export/systemd/app-bravo@.service

@@ -5,7 +5,7 @@ PartOf=app-bravo.target
 User=app
 WorkingDirectory=/tmp/app
 Environment=PORT=%i
-ExecStart=/bin/bash -lc './bravo'
+ExecStart=/bin/bash -lc 'exec ./bravo'
 Restart=always
 StandardInput=null
 StandardOutput=syslog

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.83.0
+  version: 0.84.0
 platform: ruby
 authors:
 - David Dollar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor