Permalink
Browse files

Allow all start command output to be put into the logs when bash && a…

…re used
  • Loading branch information...
1 parent adfa7a3 commit 26f4694d644b280b8eb6ba8468477be421382528 Maria Shaldibina and Tim Labeeuw committed Feb 21, 2013
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/vcap/staging/plugin/staging_plugin.rb
  2. +1 −1 spec/unit/buildpack_spec.rb
@@ -165,7 +165,7 @@ def generate_startup_script(env_vars = {})
<%= after_env_before_script %>
DROPLET_BASE_DIR=$PWD
<%= change_directory_for_start %>
-<%= start_command %> > $DROPLET_BASE_DIR/logs/stdout.log 2> $DROPLET_BASE_DIR/logs/stderr.log &
+(<%= start_command %>) > $DROPLET_BASE_DIR/logs/stdout.log 2> $DROPLET_BASE_DIR/logs/stderr.log &
<%= get_launched_process_pid %>
echo "$STARTED" >> #{pidfile_dir}/run.pid
<%= wait_for_launched_process %>
@@ -258,7 +258,7 @@ def start_script_body(staged_dir)
end
def packages_with_start_script(staged_dir, start_command)
- start_script_body(staged_dir).should include("#{start_command} > $DROPLET_BASE_DIR/logs/stdout.log 2> $DROPLET_BASE_DIR/logs/stderr.log &")
+ start_script_body(staged_dir).should include("(#{start_command}) > $DROPLET_BASE_DIR/logs/stdout.log 2> $DROPLET_BASE_DIR/logs/stderr.log &")
end
def buildpack_staging_env(services=[])

0 comments on commit 26f4694

Please sign in to comment.