git.ucc.asn.au
/
zanchey
/
dispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add signal handling code, misc cleanups
[zanchey/dispense2.git]
/
sql-edition
/
servers
/
LATClient.py
diff --git
a/sql-edition/servers/LATClient.py
b/sql-edition/servers/LATClient.py
index
b7818de
..
7c21d0d
100644
(file)
--- a/
sql-edition/servers/LATClient.py
+++ b/
sql-edition/servers/LATClient.py
@@
-46,9
+46,12
@@
class LATClient:
if ord(cmd) == LATCP_CMD_ERRORMSG:
raise LATClientException(msg)
if ord(cmd) == LATCP_CMD_ERRORMSG:
raise LATClientException(msg)
- r = select([self.sock], [], [], 2.0)[0]
+ self.rfh = self.sock.makefile('r')
+ self.wfh = self.sock.makefile('w')
+
+ r = select([self.rfh], [], [], 2.0)[0]
if r:
if r:
- l = self.
sock
.readline()
+ l = self.
rfh
.readline()
if l.find('Service in use') >= 0:
print "Service in use, apparently: restarting DEC server"
self.reboot_server()
if l.find('Service in use') >= 0:
print "Service in use, apparently: restarting DEC server"
self.reboot_server()
@@
-75,20
+78,23
@@
class LATClient:
mop.write(self.priv_password+'\n')
mop.write('init del 0\n')
mop.close()
mop.write(self.priv_password+'\n')
mop.write('init del 0\n')
mop.close()
+ print
print "Waiting 10 seconds for DEC server to come back to life..."
sleep(10)
print "Waiting 10 seconds for DEC server to come back to life..."
sleep(10)
+ print "Rightyo, back to vending!"
+ print
+ raise LATClientException('needed to reboot server')
def read_reply(self):
head = self.sock.recv(3)
if len(head) != 3:
def read_reply(self):
head = self.sock.recv(3)
if len(head) != 3:
- sys.stderr.write('Error: Short LAT packet\n')
- return None
+ raise LATClientException('Short LAT packet')
cmd = head[0]
length = ord(head[1])*256 + ord(head[2])
msg = self.sock.recv(length)
if cmd == LATCP_CMD_ERRORMSG:
cmd = head[0]
length = ord(head[1])*256 + ord(head[2])
msg = self.sock.recv(length)
if cmd == LATCP_CMD_ERRORMSG:
-
sys.stderr.write('Error: Received LAT error: %s\n
'%msg)
+
raise LATClientException('Received LAT error: %s
'%msg)
return (cmd, msg)
def get_fh(self):
return (cmd, msg)
def get_fh(self):
- return (self.
sock.makefile('r'), self.sock.makefile('w')
)
+ return (self.
rfh, self.wfh
)
UCC
git Repository :: git.ucc.asn.au