You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by Francesco Vollero <fv...@redhat.com> on 2012/02/01 13:52:42 UTC
[PATCH core] Changed valid_credentials? to handle right exceptions
Signed-off-by: Francesco Vollero <fv...@redhat.com>
---
server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
index 5c1ddcc..50bc39f 100644
--- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
+++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
@@ -712,13 +712,15 @@ module Deltacloud
end
def valid_credentials?(credentials)
- retval = true
begin
- realms(credentials)
- rescue
+ realms(credentials) && true
+ rescue Aws::AwsError::AuthFailure
retval = false
+ rescue => e
+ safely do
+ raise e
+ end
end
- retval
end
private
--
1.7.7.6
Re: [PATCH core] Changed valid_credentials? to handle right exceptions
Posted by Michal Fojtik <mi...@mifo.sk>.
On Feb 1, 2012, at 1:52 PM, Francesco Vollero wrote:
ACK.
>
> Signed-off-by: Francesco Vollero <fv...@redhat.com>
> ---
> server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 10 ++++++----
> 1 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
> index 5c1ddcc..50bc39f 100644
> --- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
> +++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
> @@ -712,13 +712,15 @@ module Deltacloud
> end
>
> def valid_credentials?(credentials)
> - retval = true
> begin
> - realms(credentials)
> - rescue
> + realms(credentials) && true
> + rescue Aws::AwsError::AuthFailure
> retval = false
> + rescue => e
> + safely do
> + raise e
> + end
> end
> - retval
> end
>
> private
> --
> 1.7.7.6
>