From: Alfredo Deza <adeza@redhat.com>
Date: Thu, 5 Mar 2015 19:55:41 +0000 (-0500)
Subject: make the client use the new NetworkError exception
X-Git-Tag: v1.2.2~9^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=edd323b784c36e58e223368457d83fdb4f5ebb00;p=radosgw-agent.git

make the client use the new NetworkError exception

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/radosgw_agent/client.py b/radosgw_agent/client.py
index 73373a2..d89b18a 100644
--- a/radosgw_agent/client.py
+++ b/radosgw_agent/client.py
@@ -3,6 +3,7 @@ import functools
 import json
 import logging
 import random
+import socket
 import urllib
 from urlparse import urlparse
 
@@ -12,6 +13,7 @@ from boto.s3.connection import S3Connection
 from radosgw_agent import request as aws_request
 from radosgw_agent import exceptions as exc
 from radosgw_agent.constants import DEFAULT_TIME
+from radosgw_agent.exceptions import NetworkError
 
 log = logging.getLogger(__name__)
 
@@ -131,6 +133,10 @@ def request(connection, type_, resource, params=None, headers=None,
             data=request_data,
             params=safe_params,
             _retries=_retries)
+    except socket.error as error:
+        msg = 'unable to connect to %s %s' % (request.host, error)
+        raise NetworkError(msg)
+
     except BotoServerError as error:
         check_result_status(error)