Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Content server: If fails to bind to 0.0.0.0 try detecting and binding only to interface used for outgoing traffic

Browse Source
This commit is contained in:
Kovid Goyal 2010-02-25 23:54:43 -07:00
parent 6f39d6ebec
commit b8eac0058c
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/calibre/library/server.py
View File

@ -28,7 +28,7 @@ from calibre.library import server_config as config
from calibre.library.database2 import LibraryDatabase2, FIELD_MAP from calibre.library.database2 import LibraryDatabase2, FIELD_MAP
from calibre.utils.config import config_dir from calibre.utils.config import config_dir
from calibre.utils.mdns import publish as publish_zeroconf, \ from calibre.utils.mdns import publish as publish_zeroconf, \
stop_server as stop_zeroconf stop_server as stop_zeroconf, get_external_ip
from calibre.ebooks.metadata import fmt_sidx, title_sort from calibre.ebooks.metadata import fmt_sidx, title_sort
from calibre.utils.date import now as nowf, fromtimestamp from calibre.utils.date import now as nowf, fromtimestamp
@ -402,22 +402,44 @@ class LibraryServer(object):
h.setFormatter(cherrypy._cplogging.logfmt) h.setFormatter(cherrypy._cplogging.logfmt)
log.access_log.addHandler(h) log.access_log.addHandler(h)
def start(self): def start(self):
self.is_running = False self.is_running = False
self.setup_loggers() self.setup_loggers()
cherrypy.tree.mount(self, '', config=self.config) cherrypy.tree.mount(self, '', config=self.config)
try:
try: try:
cherrypy.engine.start() cherrypy.engine.start()
except:
ip = get_external_ip()
if not ip or ip == '127.0.0.1':
raise
cherrypy.log('Trying to bind to single interface: '+ip)
cherrypy.config.update({'server.socket_host' : ip})
cherrypy.engine.start()
self.is_running = True self.is_running = True
try:
publish_zeroconf('Books in calibre', '_stanza._tcp', publish_zeroconf('Books in calibre', '_stanza._tcp',
self.opts.port, {'path':'/stanza'}) self.opts.port, {'path':'/stanza'})
except:
import traceback
print 'Failed to start BonJour:'
cherrypy.log('Failed to start BonJour:')
cherrypy.log(traceback.format_exc())
traceback.print_exc()
cherrypy.engine.block() cherrypy.engine.block()
except Exception, e: except Exception, e:
self.exception = e self.exception = e
finally: finally:
self.is_running = False self.is_running = False
try:
stop_zeroconf() stop_zeroconf()
except:
import traceback
print 'Failed to stop BonJour:'
cherrypy.log('Failed to stop BonJour:')
cherrypy.log(traceback.format_exc())
traceback.print_exc()
def exit(self): def exit(self):
cherrypy.engine.exit() cherrypy.engine.exit()