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),
+ ]
+ 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)
logging.debug('PING is ' + str(v.ping()))
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
# 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 = time() + 30
+ choose_idler()
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 is not None and time() > time_to_idle: idle_step()
+ if time() > time_to_idle + 300:
+ time_to_idle = time()
+ choose_idler()
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
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')
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:
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()
+ set_up_logging(options)
if options.pid_file != '': create_pid_file(options.pid_file)
return options, config_opts
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:
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)
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:
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)