[svn] commit: r2681 - /trunk/src/bin/bindctl/bindcmd.py
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Aug 10 09:27:05 UTC 2010
Author: jelte
Date: Tue Aug 10 09:27:05 2010
New Revision: 2681
Log:
better printing of errors when reading and sending user login information from bindctl to cmdctl; ticket #260
(coded by tingting, reviewed partly by shane, the rest by me)
Modified:
trunk/src/bin/bindctl/bindcmd.py
Modified: trunk/src/bin/bindctl/bindcmd.py
==============================================================================
--- trunk/src/bin/bindctl/bindcmd.py (original)
+++ trunk/src/bin/bindctl/bindcmd.py Tue Aug 10 09:27:05 2010
@@ -38,7 +38,6 @@
import json
import pwd
import getpass
-import traceback
try:
from collections import OrderedDict
@@ -123,7 +122,6 @@
except FailToLogin as err:
print(err)
print(FAIL_TO_CONNECT_WITH_CMDCTL)
- traceback.print_exc()
except KeyboardInterrupt:
print('\nExit from bindctl')
@@ -142,8 +140,8 @@
users_info = csv.reader(csvfile)
for row in users_info:
users.append([row[0], row[1]])
- except (IOError, IndexError) as e:
- pass
+ except (IOError, IndexError) as err:
+ print("Error reading saved username and password from %s%s: %s" % (dir, file_name, err))
finally:
if csvfile:
csvfile.close()
@@ -162,8 +160,9 @@
writer = csv.writer(csvfile)
writer.writerow([username, passwd])
csvfile.close()
- except Exception as e:
- print(e, "\nCannot write %s%s; default user is not stored" % (dir, file_name))
+ except IOError as err:
+ print("Error saving user information:", err)
+ print("user info file name: %s%s" % (dir, file_name))
return False
return True
@@ -183,8 +182,8 @@
try:
response = self.send_POST('/login', param)
data = response.read().decode()
- except socket.error:
- traceback.print_exc()
+ except socket.error as err:
+ print("Socket error while sending login information:", err)
raise FailToLogin()
if response.status == http.client.OK:
@@ -206,8 +205,8 @@
response = self.send_POST('/login', param)
data = response.read().decode()
print(data)
- except socket.error as e:
- traceback.print_exc()
+ except socket.error as err:
+ print("Socket error while sending login information:", err)
raise FailToLogin()
if response.status == http.client.OK:
More information about the bind10-changes
mailing list