X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendingMachine.py;h=4a409221a536f2fed9dbef3273775c7ef7a56218;hp=9506daf0599b8c2d0b44697c32e2c6466ea98f87;hb=1b24fcf5041fa3cb7e783d57fb271ab4869c348b;hpb=f8c205a5a1c5c033e7469496559b3574b9d9a6e0 diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py index 9506daf..4a40922 100644 --- a/sql-edition/servers/VendingMachine.py +++ b/sql-edition/servers/VendingMachine.py @@ -2,7 +2,7 @@ import re from CRC import do_crc from select import select -import socket +import socket, logging asynchronous_responses = [ '400', '401', # door open/closed '610', # switches changed @@ -42,7 +42,6 @@ class VendingMachine: try: s = self.rfh.read(1) except socket.error: - print "Blah, seems DEC server has fallen over" raise VendingException('failed to read input from vending machine') if s == '': raise VendingException('nothing read!') if s == '\n' or s == '\r': @@ -97,7 +96,7 @@ class VendingMachine: elif code[0] == '2': self.events.append((KEY, int(code[1:3]))) else: - sys.stderr.write('WARNING: Unhandled event! (%s %s)\n'%(code,text)) + logging.warning('Unhandled event! (%s %s)\n'%(code,text)) def authed_message(self, message): if self.challenge == None: