git.ucc.asn.au
/
uccvend-vendserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Random idler fixes.
[uccvend-vendserver.git]
/
sql-edition
/
servers
/
VendingMachine.py
diff --git
a/sql-edition/servers/VendingMachine.py
b/sql-edition/servers/VendingMachine.py
index
9506daf
..
4a40922
100644
(file)
--- 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 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
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:
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':
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:
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:
def authed_message(self, message):
if self.challenge == None:
UCC
git Repository :: git.ucc.asn.au