Return-Path: Delivered-To: apmail-incubator-deltacloud-commits-archive@minotaur.apache.org Received: (qmail 28467 invoked from network); 8 Jul 2010 23:41:54 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Jul 2010 23:41:54 -0000 Received: (qmail 81730 invoked by uid 500); 8 Jul 2010 23:41:54 -0000 Delivered-To: apmail-incubator-deltacloud-commits-archive@incubator.apache.org Received: (qmail 81709 invoked by uid 500); 8 Jul 2010 23:41:54 -0000 Mailing-List: contact deltacloud-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: deltacloud-dev@incubator.apache.org Delivered-To: mailing list deltacloud-commits@incubator.apache.org Received: (qmail 81702 invoked by uid 99); 8 Jul 2010 23:41:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jul 2010 23:41:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jul 2010 23:41:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D5FA42388C0E; Thu, 8 Jul 2010 23:40:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r962249 - in /incubator/deltacloud/trunk/server: lib/deltacloud/base_driver/base_driver.rb server.rb views/errors/backend_error.html.haml views/errors/backend_error.xml.haml Date: Thu, 08 Jul 2010 23:40:53 -0000 To: deltacloud-commits@incubator.apache.org From: lutter@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100708234053.D5FA42388C0E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lutter Date: Thu Jul 8 23:40:53 2010 New Revision: 962249 URL: http://svn.apache.org/viewvc?rev=962249&view=rev Log: Error handling: BackendError for reporting unexplained backend problems Added: incubator/deltacloud/trunk/server/views/errors/backend_error.html.haml incubator/deltacloud/trunk/server/views/errors/backend_error.xml.haml Modified: incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/base_driver.rb incubator/deltacloud/trunk/server/server.rb Modified: incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/base_driver.rb URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/base_driver.rb?rev=962249&r1=962248&r2=962249&view=diff ============================================================================== --- incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/base_driver.rb (original) +++ incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/base_driver.rb Thu Jul 8 23:40:53 2010 @@ -20,6 +20,16 @@ module Deltacloud class AuthException < Exception end + class BackendError < StandardError + attr_reader :code, :cause, :details + def initialize(code, cause, message, details) + super(message) + @code = code + @cause = cause + @details = details + end + end + class BaseDriver def self.define_hardware_profile(name,&block) Modified: incubator/deltacloud/trunk/server/server.rb URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/server.rb?rev=962249&r1=962248&r2=962249&view=diff ============================================================================== --- incubator/deltacloud/trunk/server/server.rb (original) +++ incubator/deltacloud/trunk/server/server.rb Thu Jul 8 23:40:53 2010 @@ -81,6 +81,10 @@ error Deltacloud::AuthException do report_error(403, "auth_exception") end +error Deltacloud::BackendError do + report_error(500, "backend_error") +end + # Redirect to /api get '/' do redirect '/api'; end Added: incubator/deltacloud/trunk/server/views/errors/backend_error.html.haml URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/views/errors/backend_error.html.haml?rev=962249&view=auto ============================================================================== --- incubator/deltacloud/trunk/server/views/errors/backend_error.html.haml (added) +++ incubator/deltacloud/trunk/server/views/errors/backend_error.html.haml Thu Jul 8 23:40:53 2010 @@ -0,0 +1,17 @@ +%h1 Backend Error + +%p= @error.message + +%dl + %di + %dt Request URL + %dd= request.env['REQUEST_URI'] + %di + %dt Code + %dd= @error.code + %di + %dt Cause + %dd= @error.cause + %di + %dt Details + %dd= @error.details Added: incubator/deltacloud/trunk/server/views/errors/backend_error.xml.haml URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/views/errors/backend_error.xml.haml?rev=962249&view=auto ============================================================================== --- incubator/deltacloud/trunk/server/views/errors/backend_error.xml.haml (added) +++ incubator/deltacloud/trunk/server/views/errors/backend_error.xml.haml Thu Jul 8 23:40:53 2010 @@ -0,0 +1,8 @@ +%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"} + %kind backend_error + %backend{ :driver => DRIVER } + %code= @error.code + %cause= @error.cause + - if @error.details + %details #{@error.details} + %message #{@error.message}