From dd39ae3a5479eed32d57d1d3934d907a82048486 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Wed, 29 Feb 2012 19:45:15 +0000
Subject: duplicated error logs not yet solved

---
 lib/error.rb |  9 ++++++---
 lib/task.rb  | 14 +++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/error.rb b/lib/error.rb
index 0e467d9..88c8be8 100644
--- a/lib/error.rb
+++ b/lib/error.rb
@@ -28,9 +28,12 @@ module OpenTox
       @error = error
       @actor = actor
       @report = ErrorReport.create error, actor
+      # TODO avoid error log duplication, improve output
       msg = "\nActor: \"#{actor}\"\n"
-      msg += @error.to_yaml
-      #$logger.error msg
+      msg += "\nCode: #{@report.http_code}"
+      msg += "\nerrorCause: #{@report.errorCause}\n"
+      msg += @report.message
+      $logger.error msg
       super msg
     end
   end
@@ -43,7 +46,7 @@ module OpenTox
     private
     def initialize( http_code, erroType, message, actor, errorCause, rest_params=nil, backtrace=nil )
       @http_code = http_code
-      #@errorType = erroType
+      @errorType = erroType
       @message = message
       @actor = actor
       @errorCause = errorCause
diff --git a/lib/task.rb b/lib/task.rb
index a28a0aa..d3b6312 100644
--- a/lib/task.rb
+++ b/lib/task.rb
@@ -9,7 +9,7 @@ module OpenTox
 
     def self.create service_uri, params={}
 
-      # TODO set request uri
+      # TODO set/enforce request uri
       task = Task.new RestClientWrapper.post(service_uri,params).chomp
       pid = fork do
         begin
@@ -17,7 +17,8 @@ module OpenTox
           if URI.accessible?(result_uri)
             task.completed result_uri
           else
-            task.error OpenTox::RestError.new :http_code => 404, :cause => "#{result_uri} is not a valid URI", :actor => params[:creator]
+            raise "\"#{result_uri}\" is not a valid result URI"
+            #task.error OpenTox::RestError.new :http_code => 404, :cause => "#{result_uri} is not a valid URI", :actor => params[:creator]
           end
         rescue 
           task.error $! 
@@ -44,7 +45,7 @@ module OpenTox
     def kill
       Process.kill(9,@pid)
       Process.kill(9,@observer_pid)
-      rescue # no need to raise an aexeption if processes are not running
+      rescue # no need to raise an exeption if processes are not running
     end
 
     def description
@@ -61,14 +62,13 @@ module OpenTox
     end
 
     def completed(uri)
-      #TODO: subjectid?
-      #TODO: error code
-      error OpenTox::RestError.new :http_code => 404, :cause => "\"#{uri}\" does not exist.", :actor => creator unless URI.accessible? uri
+      #error OpenTox::RestError.new :http_code => 404, :cause => "\"#{uri}\" does not exist.", :actor => creator unless URI.accessible? uri
+      raise "Result URI \"#{uri}\" does not exist." unless URI.accessible? uri
       RestClientWrapper.put(File.join(@uri,'Completed'),{:resultURI => uri})
     end
 
     def error error
-      error = OpenTox::TaskError.new error, self.creator
+      error = OpenTox::TaskError.new error, creator
       RestClientWrapper.put(File.join(@uri,'Error'),{:errorReport => error.report})
       kill
       raise error
-- 
cgit v1.2.3