nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash if we couldn't import ExMachina.

Browse Source
This commit is contained in:
Nick Daly 2013-03-23 18:45:07 -05:00
parent bef0bcecca
commit ea49a08675
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plinth.py
View File

@ -17,7 +17,6 @@ from util import *
from logger import Logger from logger import Logger
#from modules.auth import AuthController, require, member_of, name_is #from modules.auth import AuthController, require, member_of, name_is
from exmachina import ExMachinaClient
import socket import socket
__version__ = "0.2.14" __version__ = "0.2.14"
@ -100,11 +99,16 @@ def setup():
pass pass
try: try:
cfg.exmachina = ExMachinaClient( from exmachina import ExMachinaClient
secret_key=cfg.exmachina_secret_key or None) except ImportError:
except socket.error:
cfg.exmachina = None cfg.exmachina = None
print "couldn't connect to exmachina daemon, but continuing anyways..." else:
try:
cfg.exmachina = ExMachinaClient(
secret_key=cfg.exmachina_secret_key or None)
except socket.error:
cfg.exmachina = None
print "couldn't connect to exmachina daemon, but continuing anyways..."
os.chdir(cfg.file_root) os.chdir(cfg.file_root)
cherrypy.config.update({'error_page.404': error_page_404}) cherrypy.config.update({'error_page.404': error_page_404})
@ -124,25 +128,26 @@ def setup():
server.subscribe() server.subscribe()
# Configure default server # Configure default server
cherrypy.config.update({'server.socket_host': cfg.host, cherrypy.config.update(
'server.socket_port': cfg.port, { 'server.socket_host': cfg.host,
'server.thread_pool':10, 'server.socket_port': cfg.port,
'tools.staticdir.root': cfg.file_root, 'server.thread_pool':10,
'tools.sessions.on':True, 'tools.staticdir.root': cfg.file_root,
'tools.auth.on':True, 'tools.sessions.on':True,
'tools.sessions.storage_type':"file", 'tools.auth.on':True,
'tools.sessions.timeout':90, 'tools.sessions.storage_type':"file",
'tools.sessions.storage_path':"%s/data/cherrypy_sessions" % cfg.file_root, 'tools.sessions.timeout':90,
'tools.sessions.storage_path':
}) "%s/data/cherrypy_sessions" % cfg.file_root,
})
config = {'/': {'tools.staticdir.root': '%s/static' % cfg.file_root, config = {'/': {'tools.staticdir.root': '%s/static' % cfg.file_root,
'tools.proxy.on':True,}, 'tools.proxy.on':True,},
'/static': {'tools.staticdir.on': True, '/static': {'tools.staticdir.on': True,
'tools.staticdir.dir':"."}, 'tools.staticdir.dir':"."},
'/favicon.ico':{'tools.staticfile.on':True, '/favicon.ico':{'tools.staticfile.on':True,
'tools.staticfile.filename': "%s/static/theme/favicon.ico" % cfg.file_root} 'tools.staticfile.filename':
} "%s/static/theme/favicon.ico" % cfg.file_root}}
cherrypy.tree.mount(cfg.html_root, '/', config=config) cherrypy.tree.mount(cfg.html_root, '/', config=config)
cherrypy.engine.signal_handler.subscribe() cherrypy.engine.signal_handler.subscribe()