Merge changes from master, PR #280 and resolve conflicts

This commit is contained in:
Khanh Ngo
2018-06-13 11:05:53 +07:00
918 changed files with 1236 additions and 226114 deletions

View File

@ -12,10 +12,14 @@ class SQLAlchemy(SA):
options["pool_pre_ping"] = True
from app.assets import assets
app = Flask(__name__)
app.config.from_object('config')
app.wsgi_app = ProxyFix(app.wsgi_app)
assets.init_app(app)
#### CONFIGURE LOGGER ####
from app.lib.log import logger
logging = logger('powerdns-admin', app.config['LOG_LEVEL'], app.config['LOG_FILE']).config()