From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 12 Aug 2015 16:58:47 +0000 (-0400)
Subject: [RM-12677] reference HttpError from the right location: exc module
X-Git-Tag: v1.2.4~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F36%2Fhead;p=radosgw-agent.git

[RM-12677] reference HttpError from the right location: exc module

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

diff --git a/radosgw_agent/lock.py b/radosgw_agent/lock.py
index d3d45e0..3e64f16 100644
--- a/radosgw_agent/lock.py
+++ b/radosgw_agent/lock.py
@@ -3,6 +3,7 @@ import threading
 import time
 
 from radosgw_agent import client
+from radosgw_agent import exceptions as exc
 from radosgw_agent.util import get_dev_logger
 
 log = logging.getLogger(__name__)
@@ -95,7 +96,7 @@ class Lock(threading.Thread):
             try:
                 client.unlock_shard(self.conn, self.type, shard_num,
                                     self.zone_id, self.locker_id)
-            except client.HttpError as e:
+            except exc.HttpError as e:
                 log.warn('failed to unlock shard %d in zone %s: %s',
                          shard_num, self.zone_id, e)
             self.last_locked = None
@@ -106,7 +107,7 @@ class Lock(threading.Thread):
                 if self.shard_num is not None:
                     try:
                         self._acquire()
-                    except client.HttpError as e:
+                    except exc.HttpError as e:
                         log.error('locking shard %d in zone %s failed: %s',
                                   self.shard_num, self.zone_id, e)
                         self.failed = True