summaryrefslogtreecommitdiffstats
path: root/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user
diff options
context:
space:
mode:
Diffstat (limited to 'gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user')
-rwxr-xr-xgluster/swift/common/middleware/gswauth/bin/gswauth-delete-user17
1 files changed, 13 insertions, 4 deletions
diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user b/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user
index f778603..5e56a79 100755
--- a/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user
@@ -15,8 +15,9 @@
# limitations under the License.
import gettext
+import socket
+
from optparse import OptionParser
-from os.path import basename
from sys import argv, exit
from swift.common.bufferedhttp import http_connect_raw as http_connect
@@ -57,9 +58,17 @@ if __name__ == '__main__':
path = '%sv2/%s/%s' % (parsed_path, account, user)
headers = {'X-Auth-Admin-User': options.admin_user,
'X-Auth-Admin-Key': options.admin_key}
- conn = http_connect(parsed.hostname, parsed.port, 'DELETE', path, headers,
- ssl=(parsed.scheme == 'https'))
- resp = conn.getresponse()
+ try:
+ conn = http_connect(parsed.hostname, parsed.port, 'DELETE', path, headers,
+ ssl=(parsed.scheme == 'https'))
+ resp = conn.getresponse()
+ except socket.gaierror, err:
+ exit('User deletion failed: %s. ' \
+ 'Check that the admin_url is valid' % err)
+ except socket.error, (errno, msg):
+ exit('User deletion failed: %s. ' \
+ 'Check that the admin_url is valid' % msg)
+
if resp.status // 100 != 2:
if resp.status == 401:
exit('Delete user failed: %s %s: Invalid user/key provided' %