X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FLATClient.py;h=638d20b05bc1f3a136a93f2c5fd415f964c1048e;hp=362a452ea9e0d0fe05ad4dd9146f83d81bd98efb;hb=08a392617c464e6336d47ba37168c3a3a2529123;hpb=a1f84706e31c65738e52ee1405fa8e54f4e2407b

diff --git a/sql-edition/servers/LATClient.py b/sql-edition/servers/LATClient.py
index 362a452..638d20b 100644
--- a/sql-edition/servers/LATClient.py
+++ b/sql-edition/servers/LATClient.py
@@ -1,15 +1,46 @@
 from socket import *
 from select import select
-from os import popen
+from os import popen4
 from time import sleep
+import logging
 
 LATCP_SOCKET = '/var/run/latlogin'
 
-LAT_VERSION = '1.21'
+LAT_VERSION = '1.22'
+LAT_VERSION = '1.24' # for running on Mermaid. [DAA] 20071107
 LATCP_CMD_VERSION = 8
 LATCP_CMD_TERMINALSESSION = 26
 LATCP_CMD_ERRORMSG = 99
 
+class LATClientException(Exception): pass
+
+def read_for_a_bit(rfh):
+	message = ''
+	while 1:
+		r = select([rfh], [], [], 5.0)[0]
+		if r:
+			try:
+				ch = rfh.read(1)
+			except socket.error:
+				ch = ''
+			if ch == '':
+				break
+			message = message + ch
+		else:
+			break
+	logging.debug("Received message: ", repr(message))
+	return message
+
+def write_and_get_response(rfh, wfh, message, expect_echo=True):
+	logging.debug("Writing message:", repr(message))
+	wfh.write(message+'\r\n')
+	wfh.flush()
+	logging.debug("  --> Sent")
+	response = read_for_a_bit(rfh)
+	if response.find(message) == -1 and expect_echo:
+		raise LATClientException("Talking to DEC server, expected to find original message in echo but didn't")
+	return response
+
 class LATClient:
 	def __init__(self, service = None, node = None, port = None,
 		     localport = None, password = None, is_queued = False,
@@ -42,13 +73,16 @@ class LATClient:
 			 ))
 		(cmd, msg) = self.read_reply()
 		if ord(cmd) == LATCP_CMD_ERRORMSG:
-			raise Exception('LATClient: '+msg)
+			raise LATClientException(msg)
+
+		self.rfh = self.sock.makefile('r')
+		self.wfh = self.sock.makefile('w')
 
-		r = select([self.sock], [], [], 2.0)[0]
+		r = select([self.rfh], [], [], 2.0)[0]
 		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"
+				logging.warning("Service in use, apparently: restarting DEC server")
 				self.reboot_server()
 
 	def __del__(self):
@@ -65,28 +99,59 @@ class LATClient:
 	def reboot_server(self):
 		self.sock.shutdown(2)
 		self.sock.close()
-		mop = popen('/usr/sbin/moprc '+self.server_name, 'w')
-		mop.write('\n')
-		mop.write(self.connect_password+'\n')
-		mop.write('grim reaper\n')
-		mop.write('set priv\n')
-		mop.write(self.priv_password+'\n')
-		mop.write('init del 0\n')
-		mop.close()
-		print "Waiting 10 seconds for DEC server to come back to life..."
+		
+		logging.info('Logging into DEC server')
+		mopw, mopr = popen4('/usr/sbin/moprc '+self.server_name)
+		write_and_get_response(mopr, mopw, '')
+
+		logging.info('Sending password')
+		r = write_and_get_response(mopr, mopw, self.connect_password, False)
+		if r.find('Enter username> ') == -1:
+			logging.warning("Expected username prompt, got " + repr(r))
+			raise LATClientException('failed to reboot server')
+
+		logging.info('Sending username')
+		r = write_and_get_response(mopr, mopw, 'grim reaper')
+		if r.find('Local> ') == -1:
+			logging.warning("Expected DEC server prompt, got " + repr(r))
+			raise LATClientException('failed to reboot server')
+
+		logging.info('Requesting privileges')
+		r = write_and_get_response(mopr, mopw, 'set priv')
+		if r.find('Password> ') == -1:
+			logging.warning("Expected priv password prompt, got " + repr(r))
+			raise LATClientException('failed to reboot server')
+
+		logging.info('Sending password')
+		r = write_and_get_response(mopr, mopw, self.priv_password, False)
+		if r.find('Local> ') == -1:
+			logging.warning("Expected DEC server prompt, got " + repr(r))
+			raise LATClientException('failed to reboot server')
+
+		logging.info('Sending reboot request')
+		r = write_and_get_response(mopr, mopw, 'init del 0')
+		if r.find('Target does not respond') == -1:
+			logging.warning("Expected DEC server to die, got " + repr(r))
+			raise LATClientException('failed to reboot server')
+
+		logging.info('Closed connection to server')
+		mopr.close()
+		mopw.close()
+		logging.info("Waiting 10 seconds for DEC server to come back to life...")
 		sleep(10)
+		logging.info("Rightyo, back to vending!")
+		raise LATClientException('needed to reboot server')
 
 	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:
-			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 (self.sock.makefile('r'), self.sock.makefile('w'))
+		return (self.rfh, self.wfh)