job.rb in cloudist-0.2.0

- old
+ new

@@ -19,30 +19,30 @@
     
     def cleanup
       
     end
     
-    def reply(data, headers = {}, options = {})
+    def reply(body, headers = {}, options = {})
       options = {
         :echo => false
       }.update(options)
       
       headers = {
         :message_id => payload.headers[:message_id],
         :message_type => "reply"
       }.update(headers)
       
       # Echo the payload back
-      data.merge!(payload.body) if options[:echo] == true
+      # body.merge!(payload.body) if options[:echo] == true
       
-      reply_payload = Payload.new(data, headers)
+      reply_payload = Payload.new(body, headers)
       
       reply_queue = ReplyQueue.new(payload.reply_to)
       reply_queue.setup
       published_headers = reply_queue.publish_to_q(reply_payload)
       
-      log.debug("Replying: #{data.inspect} - Headers: #{published_headers.inspect}")
+      log.debug("Replying: #{body.inspect} HEADERS: #{headers.inspect}")
     end
     
     # Sends a progress update
     # Inputs: percentage - Integer
     # Optional description, this could be displayed to the user e.g. Resizing image
@@ -51,9 +51,24 @@
     end
     
     def event(event_name, event_data = {}, options = {})
       event_data = {} if event_data.nil?
       reply(event_data, {:event => event_name, :message_type => 'event'}, options)
+    end
+    
+    def safely(&blk)
+      # begin
+      yield
+    rescue Exception => e
+      handle_error(e)
+      # end
+      # result
+    end
+    
+    # This will transfer the Exception object to the client
+    def handle_error(e)
+      # reply({:exception_class => e.class.name, :message => e.message, :backtrace => e.backtrace}, {:message_type => 'error'})
+      reply({:exception => e}, {:message_type => 'error'})
     end
     
     def method_missing(meth, *args, &blk)
       if meth.to_s.ends_with?("!")
         event(meth.to_s.gsub(/(!)$/, ''), args.shift)