summaryrefslogtreecommitdiff
path: root/lib/rest_client_wrapper.rb
diff options
context:
space:
mode:
authormr <mr@mrautenberg.de>2011-08-04 18:37:33 +0200
committermr <mr@mrautenberg.de>2011-08-04 18:37:33 +0200
commit6f26ea70b05b69fb69a102fb4cec688338c1f7ff (patch)
treece05acc8adb8c64ae8cc1ea997d35744b062e35e /lib/rest_client_wrapper.rb
parent6b9e012576857fbc6c51cd86581cca792f367cdf (diff)
parent7a13c2da03220ad6716fe7da5bfa3403c873d7d1 (diff)
Merge branch 'release/v2.1.0'v2.1.0
Diffstat (limited to 'lib/rest_client_wrapper.rb')
-rw-r--r--lib/rest_client_wrapper.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/rest_client_wrapper.rb b/lib/rest_client_wrapper.rb
index 747a353..6d25bb3 100644
--- a/lib/rest_client_wrapper.rb
+++ b/lib/rest_client_wrapper.rb
@@ -131,13 +131,14 @@ module OpenTox
raise "unknown content-type for task : '"+res.content_type.to_s+"'"+" base-uri: "+base_uri.to_s+" content: "+res[0..200].to_s
end
- LOGGER.debug "result is a task '"+task.uri.to_s+"', wait for completion"
+ #LOGGER.debug "result is a task '"+task.uri.to_s+"', wait for completion"
task.wait_for_completion waiting_task
unless task.completed? # maybe task was cancelled / error
if task.errorReport
received_error task.errorReport, task.http_code, nil, {:rest_uri => task.uri, :rest_code => task.http_code}
else
- raise "task status: '"+task.status.to_s+"' but errorReport nil"
+ raise "status of task '"+task.uri.to_s+"' is no longer running (hasStatus is '"+task.status+
+ "'), but it is neither completed nor has an errorReport"
end
end