Permalink
Browse files

Fixed workitem format bug

  • Loading branch information...
1 parent 60f134b commit e3912517bc6ae79276a117d97daef3c0289ef0a5 David Austin committed Oct 6, 2010
Showing with 7 additions and 6 deletions.
  1. +5 −4 lib/worker.rb
  2. +2 −2 qips-node-amqp.gemspec
View
@@ -100,8 +100,8 @@ def start_work
instance_id = resp.body
instance_id = 'UNKNOWN' if instance_id.size > 50
- out = "\nInstance ID: #{instance_id}\nRunning: #{workitem.params['executable']} #{args} #{infiles_arg}\nWorkflow id: #{workitem.fei['wfid']}\n\n"
- out += `#{workitem.params['executable']} #{args} #{infiles_arg}`
+
+ out = `#{workitem.params['executable']} #{args} #{infiles_arg}`
DaemonKit.logger.info "Found output:"
puts out
@@ -119,8 +119,9 @@ def start_work
end
- # set executable result
- workitem["result"] = output_hash["result"]
+ # set executable result
+ workitem['result'] = "\nInstance ID: #{instance_id}\nRunning: #{workitem.params['executable']} #{args} #{infiles_arg}\nWorkflow id: #{workitem.fei['wfid']}\n\n"
+ workitem["result"] += output_hash["result"]
else
View
@@ -5,11 +5,11 @@
Gem::Specification.new do |s|
s.name = %q{qips-node-amqp}
- s.version = "0.7.11"
+ s.version = "0.7.12"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["David Austin", "Andrew Brader"]
- s.date = %q{2010-09-30}
+ s.date = %q{2010-10-05}
s.description = %q{Listens for jobs on a rabbit server, works closely with qipr-rmgr}
s.email = %q{daustin@mail.med.upenn.edu}
s.executables = ["qips-node-amqp", "status-updater.rb"]

0 comments on commit e391251

Please sign in to comment.