aboutsummaryrefslogtreecommitdiffstats
path: root/script/runner
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-06-03 18:20:31 +0100
committerLouise Crow <louise.crow@gmail.com>2013-06-03 18:20:31 +0100
commita91722f2653be237dc58121a6b895de18081dfdc (patch)
tree6e01520e44fa9cdd83c98214c3fe8a8c1e5abc1f /script/runner
parent050b25bd70909913b7e42d53cb69c31b1396cc46 (diff)
parent9a4b220be62dcaceee45c70316c1a58a92abcfc5 (diff)
Merge branch 'hotfix/0.11.0.1' into wdtk
Diffstat (limited to 'script/runner')
-rwxr-xr-xscript/runner5
1 files changed, 3 insertions, 2 deletions
diff --git a/script/runner b/script/runner
index 73b03847d..32a0e6b7e 100755
--- a/script/runner
+++ b/script/runner
@@ -19,12 +19,13 @@ Dir.chdir(alaveteli_dir) do
# Load the runner in a subprocess
pid = fork do
- `bundle exec rails runner #{ARGV[1]}`
+ exec("bundle exec rails runner #{ARGV[1]}")
exit 0
end
# If the environment variable PIDFILE is present,
# write the pid of the daemon process to that file.
+
if ENV.has_key? "PIDFILE"
File.open(ENV["PIDFILE"], 'w') do |fh|
fh.puts pid
@@ -34,6 +35,6 @@ Dir.chdir(alaveteli_dir) do
Process.detach(pid)
else
# Not daemon mode
- `bundle exec rails runner #{ARGV[1]}`
+ exec("bundle exec rails runner #{ARGV[1]}")
end
end