okay... still bugs with StringIdler

[zanchey/dispense2.git] / sql-edition / servers / VendServer.py

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 30fac43..7c4a278 100755 (executable)
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -12,12 +12,22 @@ from time import time, sleep
 from popen2 import popen2
 from LATClient import LATClient, LATClientException
 from VendingMachine import VendingMachine, VendingException
 from popen2 import popen2
 from LATClient import LATClient, LATClientException
 from VendingMachine import VendingMachine, VendingException

+from MessageKeeper import MessageKeeper

 from HorizScroll import HorizScroll
 from random import random, seed
 from HorizScroll import HorizScroll
 from random import random, seed

-from Idler import TrainIdler,GrayIdler
+from Idler import TrainIdler,GrayIdler,StringIdler

 import socket
 from posix import geteuid
 
 import socket
 from posix import geteuid
 

+CREDITS="""
+This vending machine software brought to you by:
+Bernard Blackham
+Mark Tearle
+Nick Bannon
+Cameron Patrick
+and a collective of hungry alpacas.
+"""
+

 GREETING = 'UCC SNACKS'
 PIN_LENGTH = 4
 
 GREETING = 'UCC SNACKS'
 PIN_LENGTH = 4
 


@@ -164,50 +174,34 @@ def center(str):
        LEN = 10
        return ' '*((LEN-len(str))/2)+str
 
        LEN = 10
        return ' '*((LEN-len(str))/2)+str
 

-class MessageKeeper:
-       def __init__(self, vendie):
-               # Each element of scrolling_message should be a 3-tuple of
-               # ('message', True/False if it is to be repeated, time to display)
-               self.scrolling_message = []
-               self.v = vendie
-               self.next_update = None
-
-       def set_message(self, string):
-               self.scrolling_message = [(string, False, None)]
-               self.update_display(True)
-
-       def set_messages(self, strings):
-               self.scrolling_message = strings
-               self.update_display(True)
-
-       def update_display(self, forced = False):
-               if not forced and self.next_update != None and time() < self.next_update:
-                       return
-               if len(self.scrolling_message) > 0:
-                       if len(self.scrolling_message[0][0]) > 10:
-                               (m, r, t) = self.scrolling_message[0]
-                               a = []
-                               exp = HorizScroll(m).expand(padding = 0, wraparound = True)
-                               if t == None:
-                                       t = 0.1
-                               else:
-                                       t = t / len(exp)
-                               for x in exp:
-                                       a.append((x, r, t))
-                               del self.scrolling_message[0]
-                               self.scrolling_message = a + self.scrolling_message
-                       newmsg = self.scrolling_message[0]
-                       if newmsg[2] != None:
-                               self.next_update = time() + newmsg[2]
-                       else:
-                               self.next_update = None
-                       self.v.display(self.scrolling_message[0][0])
-                       if self.scrolling_message[0][1]:
-                               self.scrolling_message.append(self.scrolling_message[0])
-                       del self.scrolling_message[0]

 
 

-       def done(self):
-               return len(self.scrolling_message) == 0
+
+idlers = []
+idler = None
+def setup_idlers(v):
+       global idlers, idler
+       idlers = [
+               TrainIdler(v),
+               GrayIdler(v),
+               GrayIdler(v,one="*",zero="-"),
+               GrayIdler(v,one="/",zero="\\"),
+               GrayIdler(v,one="X",zero="O"),
+               GrayIdler(v,one="*",zero="-",reorder=1),
+               GrayIdler(v,one="/",zero="\\",reorder=1),
+               GrayIdler(v,one="X",zero="O",reorder=1),
+               ]
+               #StringIdler(v),
+               #StringIdler(v, text=CREDITS),
+       idler = choose_idler()
+
+def choose_idler():
+       global idler
+       idler = idlers[int(random()*len(idlers))]
+       idler.reset()
+
+def idle_step():
+       global idler
+       idler.next()

 
 def run_forever(rfh, wfh, options, cf):
        v = VendingMachine(rfh, wfh)
 
 def run_forever(rfh, wfh, options, cf):
        v = VendingMachine(rfh, wfh)


@@ -221,9 +215,7 @@ def run_forever(rfh, wfh, options, cf):
        mk = MessageKeeper(v)
        mk.set_message(GREETING)
        time_to_autologout = None
        mk = MessageKeeper(v)
        mk.set_message(GREETING)
        time_to_autologout = None

-       #idler = TrainIdler(v)
-       #idler = GrayIdler(v)
-       idler = GrayIdler(v,one="*",zero="-")
+       setup_idlers(v)

        time_to_idle = None
        last_timeout_refresh = None
 
        time_to_idle = None
        last_timeout_refresh = None
 


@@ -254,15 +246,20 @@ def run_forever(rfh, wfh, options, cf):
                        # start autologout
                        time_to_autologout = time() + 15
 
                        # start autologout
                        time_to_autologout = time() + 15
 

-               if time_to_idle == None and cur_user == '': time_to_idle = time() + 60
-               if time_to_idle != None and cur_user != '': time_to_idle = None
-               if time_to_idle is not None and time() > time_to_idle: idler.next()
+               if time_to_idle == None and cur_user == '':
+                       time_to_idle = time() + 5
+                       choose_idler()
+               if time_to_idle is not None and cur_user != '': time_to_idle = None
+               if time_to_idle is not None and time() > time_to_idle: idle_step()
+               if time_to_idle is not None and time() > time_to_idle + 300:
+                       time_to_idle = time()
+                       choose_idler()

 
                mk.update_display()
 
                e = v.next_event(0)
                if e == None:
 
                mk.update_display()
 
                e = v.next_event(0)
                if e == None:

-                       e = v.next_event(0.1)
+                       e = v.next_event(0.05)

                        if e == None:
                                continue
                time_to_idle = None
                        if e == None:
                                continue
                time_to_idle = None


@@ -413,7 +410,7 @@ def parse_args():
        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)')
        op.add_option('-l', '--log-file', metavar='FILE', dest='log_file', default='', help='log output to the specified file')
        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)')
        op.add_option('-l', '--log-file', metavar='FILE', dest='log_file', default='', help='log output to the specified file')

-       op.add_option('-s', '--syslog', dest='syslog', action='store_true', default=False, help='log output to syslog')
+       op.add_option('-s', '--syslog', dest='syslog', metavar='FACILITY', default=None, help='log output to given syslog facility')

        op.add_option('-d', '--daemon', dest='daemon', action='store_true', default=False, help='run as a daemon')
        op.add_option('-v', '--verbose', dest='verbose', action='store_true', default=False, help='spit out lots of debug output')
        op.add_option('-q', '--quiet', dest='quiet', action='store_true', default=False, help='only report errors')
        op.add_option('-d', '--daemon', dest='daemon', action='store_true', default=False, help='run as a daemon')
        op.add_option('-v', '--verbose', dest='verbose', action='store_true', default=False, help='spit out lots of debug output')
        op.add_option('-q', '--quiet', dest='quiet', action='store_true', default=False, help='only report errors')


@@ -451,9 +448,7 @@ class VendConfigFile:
                                self.__dict__[option] = value
                
                except ConfigParser.Error, e:
                                self.__dict__[option] = value
                
                except ConfigParser.Error, e:

-                       logging.critical("Error reading config file "+config_file+": " + str(e))
-                       logging.critical("Bailing out")
-                       sys.exit(1)
+                       raise SystemExit("Error reading config file "+config_file+": " + str(e))

 
 def create_pid_file(name):
        try:
 
 def create_pid_file(name):
        try:


@@ -472,9 +467,9 @@ def set_stuff_up():
        signal.signal(signal.SIGINT, stop_server)
 
        options = parse_args()
        signal.signal(signal.SIGINT, stop_server)
 
        options = parse_args()

-       set_up_logging(options)

        config_opts = VendConfigFile(options.config_file, config_options)
        if options.daemon: become_daemon()
        config_opts = VendConfigFile(options.config_file, config_options)
        if options.daemon: become_daemon()

+       set_up_logging(options)

        if options.pid_file != '': create_pid_file(options.pid_file)
 
        return options, config_opts
        if options.pid_file != '': create_pid_file(options.pid_file)
 
        return options, config_opts


@@ -489,9 +484,10 @@ def clean_up_nicely(options, config_opts):
 def set_up_logging(options):
        logger = logging.getLogger()
        
 def set_up_logging(options):
        logger = logging.getLogger()
        

-       stderr_logger = logging.StreamHandler(sys.stderr)
-       stderr_logger.setFormatter(logging.Formatter('%(levelname)s: %(message)s'))
-       logger.addHandler(stderr_logger)
+       if not options.daemon:
+               stderr_logger = logging.StreamHandler(sys.stderr)
+               stderr_logger.setFormatter(logging.Formatter('%(levelname)s: %(message)s'))
+               logger.addHandler(stderr_logger)

        
        if options.log_file != '':
                try:
        
        if options.log_file != '':
                try:


@@ -501,8 +497,8 @@ def set_up_logging(options):
                except IOError, e:
                        logger.warning('unable to write to log file '+options.log_file+': '+str(e))
 
                except IOError, e:
                        logger.warning('unable to write to log file '+options.log_file+': '+str(e))
 

-       if options.syslog:
-               sys_logger = logging.handlers.SysLogHandler('/dev/log', 'daemon')
+       if options.syslog != None:
+               sys_logger = logging.handlers.SysLogHandler('/dev/log', options.syslog)

                sys_logger.setFormatter(logging.Formatter('vendserver[%d]'%(os.getpid()) + ' %(levelname)s: %(message)s'))
                logger.addHandler(sys_logger)
 
                sys_logger.setFormatter(logging.Formatter('vendserver[%d]'%(os.getpid()) + ' %(levelname)s: %(message)s'))
                logger.addHandler(sys_logger)
 


@@ -519,8 +515,12 @@ def become_daemon():
        os.dup2(fd, 0)
        os.dup2(fd, 1)
        os.dup2(fd, 2)
        os.dup2(fd, 0)
        os.dup2(fd, 1)
        os.dup2(fd, 2)

-       if os.fork() != 0:
-               sys.exit(0)
+       try:
+               if os.fork() != 0:
+                       sys.exit(0)
+               os.setsid()
+       except OSError, e:
+               raise SystemExit('failed to fork: '+str(e))

 
 def do_vend_server(options, config_opts):
        while True:
 
 def do_vend_server(options, config_opts):
        while True:


@@ -553,6 +553,8 @@ if __name__ == '__main__':
                        clean_up_nicely(options, config_opts)
                        logging.warning("Vend Server stopped")
                        break
                        clean_up_nicely(options, config_opts)
                        logging.warning("Vend Server stopped")
                        break

+               except SystemExit:
+                       break

                except:
                        (exc_type, exc_value, exc_traceback) = sys.exc_info()
                        tb = format_tb(exc_traceback, 20)
                except:
                        (exc_type, exc_value, exc_traceback) = sys.exc_info()
                        tb = format_tb(exc_traceback, 20)