More descriptive tupkg error message

Catch sql server connection death
This commit is contained in:
simo 2005-12-18 00:17:58 +00:00
parent 70af7c7d5c
commit 1c4883edba
2 changed files with 12 additions and 5 deletions

View file

@ -87,6 +87,9 @@ class ClientSocket:
reply = self.readMsg(1)
if reply['result'] == ["PASS"]:
return 1
elif reply['result'] == ["SQLERR"]:
print "SQL server-side error"
return 0
else:
return 0

View file

@ -119,11 +119,15 @@ class ClientSocket(threading.Thread):
m = md5.new()
m.update(authdata['password'][0])
encpw = m.hexdigest()
q.execute("SELECT ID, Suspended, AccountTypeID FROM Users WHERE Username = '"+
MySQLdb.escape_string(authdata['username'][0])+
"' AND Passwd = '"+
MySQLdb.escape_string(encpw)+
"'")
try:
q.execute("SELECT ID, Suspended, AccountTypeID FROM Users WHERE Username = '"+
MySQLdb.escape_string(authdata['username'][0])+
"' AND Passwd = '"+
MySQLdb.escape_string(encpw)+
"'")
except MySQLdb.OperationalError:
self.sendMsg("result=SQLERR")
return 0
if q.rowcount == 0:
self.sendMsg("result=FAIL")
return 0