Mercurial > piecrust2

comparison foodtruck/web.py @ 775:ba0a6bd5e913

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: Make it possible to run FoodTruck tests.
author Ludovic Chabant <ludovic@chabant.com>
date Mon, 04 Jul 2016 00:12:49 -0700
parents 3885421c29a3
children
comparison
equal deleted inserted replaced
774:2bb3c1a04e98 775:ba0a6bd5e913
1 import os.path 1 import os.path
2 import logging 2 import logging
3 from flask import Flask 3 from flask import Flask
4 from werkzeug import SharedDataMiddleware 4 from werkzeug import SharedDataMiddleware
5 from .blueprint import foodtruck_bp, login_manager, bcrypt_ext 5 from .blueprint import foodtruck_bp, login_manager, bcrypt_ext
6 from .configuration import FoodTruckConfigNotFoundError
7 from .sites import InvalidSiteError
6 8
7 9
8 logger = logging.getLogger(__name__) 10 logger = logging.getLogger(__name__)
9 11
10 12
11 def create_foodtruck_app(extra_settings=None): 13 def create_foodtruck_app(extra_settings=None):
12 app = Flask(__name__) 14 app = Flask(__name__)
13 app.config.from_object('foodtruck.settings') 15 app.config.from_object('foodtruck.settings')
14 app.config.from_envvar('FOODTRUCK_SETTINGS', silent=True) 16 app.config.from_envvar('FOODTRUCK_SETTINGS', silent=True)
15 if extra_settings: 17 if extra_settings:
16 app.config.from_object(extra_settings) 18 app.config.update(extra_settings)
17 19
18 admin_root = app.config.setdefault('FOODTRUCK_ROOT', os.getcwd()) 20 admin_root = app.config.setdefault('FOODTRUCK_ROOT', os.getcwd())
19 config_path = os.path.join(admin_root, 'app.cfg') 21 config_path = os.path.join(admin_root, 'app.cfg')
20 22
21 # If we're being run as the `chef admin run` command, from inside a PieCrust 23 # If we're being run as the `chef admin run` command, from inside a PieCrust