This commit is contained in:
Kovid Goyal 2013-08-23 17:45:35 +05:30
parent aa58f3a559
commit da8910bd90

View File

@ -88,7 +88,6 @@ class BonJour(SimplePlugin): # {{{
{'path':self.prefix+'/opds'}), {'path':self.prefix+'/opds'}),
] ]
def start(self): def start(self):
zeroconf_ip_address = verify_ipV4_address(self.ip_address) zeroconf_ip_address = verify_ipV4_address(self.ip_address)
try: try:
@ -110,7 +109,6 @@ class BonJour(SimplePlugin): # {{{
cherrypy.log.error('Failed to stop BonJour:') cherrypy.log.error('Failed to stop BonJour:')
cherrypy.log.error(traceback.format_exc()) cherrypy.log.error(traceback.format_exc())
stop.priority = 10 stop.priority = 10
cherrypy.engine.bonjour = BonJour(cherrypy.engine) cherrypy.engine.bonjour = BonJour(cherrypy.engine)
@ -161,7 +159,7 @@ class LibraryServer(ContentServer, MobileServer, XMLServer, OPDSServer, Cache,
'request.show_tracebacks': show_tracebacks, 'request.show_tracebacks': show_tracebacks,
'server.socket_host' : listen_on, 'server.socket_host' : listen_on,
'server.socket_port' : opts.port, 'server.socket_port' : opts.port,
'server.socket_timeout' : opts.timeout, #seconds 'server.socket_timeout' : opts.timeout, # seconds
'server.thread_pool' : opts.thread_pool, # number of threads 'server.thread_pool' : opts.thread_pool, # number of threads
'server.shutdown_timeout': st, # minutes 'server.shutdown_timeout': st, # minutes
}) })
@ -173,7 +171,7 @@ class LibraryServer(ContentServer, MobileServer, XMLServer, OPDSServer, Cache,
self.exception = None self.exception = None
auth_controller = None auth_controller = None
self.users_dict = {} self.users_dict = {}
#self.config['/'] = { # self.config['/'] = {
# 'tools.sessions.on' : True, # 'tools.sessions.on' : True,
# 'tools.sessions.timeout': 60, # Session times out after 60 minutes # 'tools.sessions.timeout': 60, # Session times out after 60 minutes
#} #}