X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=cad1c39fed7db0e0dab6e5ed024e723348392eac;hp=6d79b512e4dd11752afc15e05d241339cda2a27b;hb=1c0bfa3fd5d75950d78f0146ce99d51b5efb6377;hpb=cf6d55616fccbdf13d29440d504f6252dd0e4be4 diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py index 6d79b51..cad1c39 100755 --- a/sql-edition/servers/VendServer.py +++ b/sql-edition/servers/VendServer.py @@ -3,16 +3,19 @@ USE_DB = 0 +import ConfigParser import sys, os, string, re, pwd if USE_DB: import pg from time import time, sleep from popen2 import popen2 -from LATClient import LATClient -from VendingMachine import VendingMachine -from ConfigParser import ConfigParser +from LATClient import LATClient, LATClientException +from VendingMachine import VendingMachine, VendingException from HorizScroll import HorizScroll from random import random, seed from Idler import TrainIdler,GrayIdler +import socket +from traceback import print_tb +from posix import geteuid GREETING = 'UCC SNACKS' PIN_LENGTH = 4 @@ -110,7 +113,7 @@ def verify_user_pin(uid, pin): else: return None -def door_open_mode(vending_machine): +def door_open_mode(v): print "Entering open door mode" v.display("-FEED ME-") while True: @@ -196,31 +199,11 @@ class MessageKeeper: def done(self): return len(self.scrolling_message) == 0 -if __name__ == '__main__': - cp = ConfigParser() - cp.read('/etc/dispense/servers.conf') - DBServer = cp.get('Database', 'Server') - DBName = cp.get('Database', 'Name') - DBUser = cp.get('VendingMachine', 'DBUser') - DBPassword = cp.get('VendingMachine', 'DBPassword') - - ServiceName = cp.get('VendingMachine', 'ServiceName') - ServicePassword = cp.get('VendingMachine', 'Password') - # Open vending machine via LAT - if 0: - latclient = LATClient(service = ServiceName, password = ServicePassword) - (rfh, wfh) = latclient.get_fh() - else: - #(rfh, wfh) = popen2('../../virtualvend/vvend.py') - import socket - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0) - sock.connect(('localhost', 5150)) - rfh = sock.makefile('r') - wfh = sock.makefile('w') +def run_forever(rfh, wfh, options, cf): v = VendingMachine(rfh, wfh) print 'PING is', v.ping() - if USE_DB: db = DispenseDatabase(v, DBServer, DBName, DBUser, DBPassword) + if USE_DB: db = DispenseDatabase(v, cf.DBServer, cf.DBName, cf.DBUser, cf.DBPassword) cur_user = '' cur_pin = '' cur_selection = '' @@ -358,7 +341,10 @@ if __name__ == '__main__': # XXX this should move somewhere else: if cur_selection == '55': mk.set_message('OPENSESAME') - ret = os.system('su - "%s" -c "dispense door"'%username) + if geteuid() == 0: + ret = os.system('su - "%s" -c "dispense door"'%username) + else: + ret = os.system('dispense door') if ret == 0: mk.set_message(center('DOOR OPEN')) else: @@ -381,3 +367,106 @@ if __name__ == '__main__': sleep(0.5) cur_selection = '' time_to_autologout = time() + 8 + +def connect_to_vend(options, cf): + # Open vending machine via LAT? + if options.use_lat: + latclient = LATClient(service = cf.ServiceName, password = cf.ServicePassword, server_name = cf.ServerName, connect_password = cf.ConnectPassword, priv_password = cf.PrivPassword) + rfh, wfh = latclient.get_fh() + else: + #(rfh, wfh) = popen2('../../virtualvend/vvend.py') + import socket + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0) + sock.connect((options.host, options.port)) + rfh = sock.makefile('r') + wfh = sock.makefile('w') + + return rfh, wfh + +def parse_args(): + from optparse import OptionParser + + op = OptionParser(usage="%prog [OPTION]...") + op.add_option('-f', '--config-file', default='/etc/dispense/servers.conf', metavar='FILE', dest='config_file', help='use the specified config file instead of /etc/dispense/servers.conf') + op.add_option('-v', '--virtualvend', action='store_false', default=True, dest='use_lat', help='use the virtual vending server instead of LAT') + op.add_option('-n', '--hostname', dest='host', default='localhost', help='the hostname to connect to for virtual vending machine mode (default: localhost)') + op.add_option('-p', '--port', dest='port', default=5150, type='int', help='the port number to connect to (default: 5150)') + options, args = op.parse_args() + + if len(args) != 0: + op.error('extra command line arguments: ' + ' '.join(args)) + + return options + +config_options = { + 'DBServer': ('Database', 'Server'), + 'DBName': ('Database', 'Name'), + 'DBUser': ('VendingMachine', 'DBUser'), + 'DBPassword': ('VendingMachine', 'DBPassword'), + + 'ServiceName': ('VendingMachine', 'ServiceName'), + 'ServicePassword': ('VendingMachine', 'Password'), + + 'ServerName': ('DecServer', 'Name'), + 'ConnectPassword': ('DecServer', 'ConnectPassword'), + 'PrivPassword': ('DecServer', 'PrivPassword'), + } + +class VendConfigFile: + def __init__(self, config_file, options): + try: + cp = ConfigParser.ConfigParser() + cp.read(config_file) + + for option in options: + section, name = options[option] + value = cp.get(section, name) + self.__dict__[option] = value + + except ConfigParser.Error, e: + print "Error reading config file "+config_file+": " + str(e) + sys.exit(1) + +def do_vend_server(): + options = parse_args() + config_opts = VendConfigFile(options.config_file, config_options) + + while True: + try: + rfh, wfh = connect_to_vend(options, config_opts) + except (LATClientException, socket.error), e: + (exc_type, exc_value, exc_traceback) = sys.exc_info() + del exc_traceback + print + print "Connection error: "+str(exc_type)+" "+str(e) + print "Trying again in 5 seconds." + sleep(5) + continue + try: + run_forever(rfh, wfh, options, config_opts) + except VendingException: + print + print "Connection died, trying again..." + + +if __name__ == '__main__': + while True: + try: + do_vend_server() + except KeyboardInterrupt: + print "Killed by SIGINT." + break + except: + (exc_type, exc_value, exc_traceback) = sys.exc_info() + print + print "Uh-oh, unhandled " + str(exc_type) + " exception" + print "Message: ", str(exc_value) + print + print_tb(exc_traceback) + del exc_traceback + print + print "This message should be considered a bug in the Vend Server." + print "Please report this to someone who can fix it." + print + print "Trying again anyway (might not help, but hey...)" +