foreman-upstart-scaling 0.3 → 0.4.pre

data/data/export/upstart_scaling/process.conf.erb

@@ -4,7 +4,7 @@ respawn
 respawn limit 10 5
 kill timeout 20
 
-instance $<%= app.upcase %>_<%= process.name.upcase %>_INSTANCE
+instance $INSTANCE
 
 env PORT=<%= port %>
 <% engine.environment.each_pair do |var,value| %>
@@ -12,8 +12,7 @@ env <%= var.upcase %>=<%= value %>
 <% end %>
 
 script
-  cd <%= engine.directory %>
-  export name="<%= app %>-<%=process.name%>-$<%= app.upcase %>_<%= process.name.upcase %>_INSTANCE"
+  export name="<%= app %>-<%=process.name%>-$INSTANCE"
 
   # This little dance pipes output into logger with three
   # goals in mind:
@@ -32,6 +31,11 @@ script
   mkfifo $stdout_fifo
   mkfifo $stderr_fifo
 
+  # Capture our pid so we can pass it to logger to record 
+  # the pid of the actual job and not the pid of the logger
+  # background process.
+  job_pid=$$
+
   # Start logger reading from the fifos, in the background.
   # The parens cause the logger process to be reparented to
   # init, rather than remaining a child of the current proc.
@@ -41,28 +45,21 @@ script
   # process group as the main process, they would be killed
   # by upstart together with the main process, and all output
   # would be suppressed during termination.
-  ( exec setsid logger -i -p local0.notice -t $name <$stdout_fifo & )
-  ( exec setsid logger -i -p local0.err    -t $name <$stderr_fifo & )
+  ( exec setsid logger -p local0.notice -t "$name[$job_pid]" <$stdout_fifo & )
+  ( exec setsid logger -p local0.err    -t "$name[$job_pid]" <$stderr_fifo & )
 
   # Redirect the current shell's output to the fifos. Now that
   # we have open fds for those fifos, we don't need the file
   # system entries any more...
   exec >$stdout_fifo 2>$stderr_fifo
 
-  # ...so we'll remove it.
+  # ...so we'll remove them.
   rm $stdout_fifo
   rm $stderr_fifo
 
-  # store ENV, as `sudo -i` don't preserve it
-
-  envfile=$(mktemp)
-  echo "PORT=$PORT <%= app.upcase %>_<%= process.name.upcase %>_INSTANCE=$<%= app.upcase %>_<%= process.name.upcase %>_INSTANCE<% engine.environment.each_pair do |var,value| %> <%= var.upcase %>=<%= value %><% end %>" > $envfile
-  chmod 0700 $envfile
-  chown <%= user %> $envfile
-
   # Run the service in the usual way. Our output is already
   # going to the fifos; that won't change when the new
   # program executes.
-  exec sudo -u <%= user %> $(envline=$(cat $envfile); rm -f $envfile; echo $envline) -i '<%= process.command %>'
-end script
 
+  exec sudo -u <%= user %> PORT=$(( $PORT + $INSTANCE )) <%= process.name.upcase.gsub('-', '_') %>_INSTANCE=$INSTANCE<% engine.environment.each_pair do |var,value| %> <%= var.upcase %>=<%= value %><% end %> -i "<%= process.command %>"
+end script

data/data/export/upstart_scaling/process_instances.conf.erb

@@ -3,15 +3,13 @@ start on starting <%= app %>-<%= process.name %>
 task
 
 script
-  <%= app.upcase %>_<%= process.name.upcase %>_SCALE=$(su - <%= user %> -c 'echo $<%= app.upcase %>_<%= process.name.upcase %>_SCALE')
-  [ -z $<%= app.upcase %>_<%= process.name.upcase %>_SCALE ] && <%= app.upcase %>_<%= process.name.upcase %>_SCALE=0
-  export <%= app.upcase %>_<%= process.name.upcase %>_SCALE
+  SCALE=$(su - <%= user %> -c 'echo $<%= process.name.upcase.gsub("-", "_") %>_SCALE')
+  [ -z $SCALE ] && SCALE=0
+  export SCALE
 
   i=1
-  while [ $i -le $<%= app.upcase %>_<%= process.name.upcase %>_SCALE ]; do
-    start <%= app %>-<%= process.name %>-instance <%= app.upcase %>_<%= process.name.upcase %>_INSTANCE=$i
+  while [ $i -le $SCALE ]; do
+    start <%= app %>-<%= process.name %>-instance INSTANCE=$i
     i=$(( $i + 1 ))
   done
-
 end script
-

data/lib/foreman/export/upstart_scaling.rb

@@ -32,7 +32,7 @@ class Foreman::Export::UpstartScaling < Foreman::Export::Base
       process_instances_config = ERB.new(process_instances_template).result(binding)
       write_file "#{location}/#{app}-#{process.name}-instances.conf", process_instances_config
 
-      port = self.port
+      port = engine.port_for(process, 1, self.port)
       process_template = export_template("upstart_scaling", "process.conf.erb", template_root)
       process_config = ERB.new(process_template).result(binding)
       write_file "#{location}/#{app}-#{process.name}-instance.conf", process_config

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: foreman-upstart-scaling
 version: !ruby/object:Gem::Version
-  version: '0.3'
-  prerelease: 
+  version: 0.4.pre
+  prerelease: 4
 platform: ruby
 authors:
 - Fabio Kung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000Z
+date: 2012-06-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
-  requirement: &70309399709520 !ruby/object:Gem::Requirement
+  requirement: &70129330100600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.46.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309399709520
+  version_requirements: *70129330100600
 description: Upstart exporter for foreman, that supports worker scaling via env vars.
 email: fabio.kung@gmail.com
 executables: []
@@ -48,9 +48,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.12