Project: taskr

Revision: 209

Author: matt.zukowski

Date: 03 Jul 2008 13:46:53

• /trunk/taskr4rails/lib/taskr4rails_controller.rb

  ......	@@ -37,25 +37,23 @@
  37	37
  38	38	io = StringIO.new
  39	39	prev_stdout, prev_stderr = $stdout, $stderr
  40		output = ""
  41	40	$stdout = io
  42	41	$stderr = io
  43	42	begin
  44		pid = fork do
  45		begin
  46		if params[:ruby_code]
  47		RAILS_DEFAULT_LOGGER.debug("*** Taskr4Rails -- Executing task #{params[:task_name].inspect} with Ruby code: #{params[:ruby_code]}")
  48		eval(params[:ruby_code])
  49		end
  50		end
  51		end
  52	43	if params[:dont_wait]
  53		RAILS_DEFAULT_LOGGER.debug("*** Taskr4Rails -- Task #{params[:task_name].inspect} is being forked into its own thread.")
  	44	pid = fork do
  	45	RAILS_DEFAULT_LOGGER.debug("*** Taskr4Rails -- Executing task #{params[:task_name].inspect} with Ruby code: #{params[:ruby_code]}")
  	46	eval(params[:ruby_code])
  	47	end
  	48
  54	49	puts "Task #{params[:task_name].inspect} forked to process #{pid.inspect}".
  	50	RAILS_DEFAULT_LOGGER.debug("*** Taskr4Rails -- Task #{params[:task_name].inspect} is being forked into its own thread.")
  	51
  55	52	Process.detach(pid)
  56	53	else
  	54	RAILS_DEFAULT_LOGGER.debug("*** Taskr4Rails -- Executing task #{params[:task_name].inspect} with Ruby code: #{params[:ruby_code]}")
  57	55	RAILS_DEFAULT_LOGGER.debug("*** Taskr4Rails -- Waiting for task #{params[:task_name].inspect} to complete.")
  58		pid.join
  	56	eval(params[:ruby_code])
  59	57	end
  60	58	err = false
  61	59	rescue => e