From 6303991a69b57f6ef25e55fd4952481467f049ef Mon Sep 17 00:00:00 2001 From: Steven Loria Date: Sat, 19 Apr 2014 15:28:14 -0400 Subject: [PATCH] Correctly set bcrypt log rounds in app config --- .../{{cookiecutter.app_name}}/app.py | 10 ++++++++-- .../{{cookiecutter.app_name}}/settings.py | 14 +++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/app.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/app.py index cd2aa2d..cff05f6 100644 --- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/app.py +++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/app.py @@ -5,8 +5,13 @@ from flask_debugtoolbar import DebugToolbarExtension from {{cookiecutter.app_name}}.settings import ProdConfig from {{cookiecutter.app_name}}.assets import assets -from {{cookiecutter.app_name}}.extensions import (db, login_manager, migrate, - cache) +from {{cookiecutter.app_name}}.extensions import ( + bcrypt, + cache, + db, + login_manager, + migrate, +) from {{cookiecutter.app_name}} import public, user @@ -31,6 +36,7 @@ def register_extensions(app): toolbar = DebugToolbarExtension(app) cache.init_app(app) migrate.init_app(app, db) + bcrypt.init_app(app) return None diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/settings.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/settings.py index 51d3ab4..50a3bc3d 100644 --- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/settings.py +++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/settings.py @@ -6,14 +6,14 @@ class Config(object): SECRET_KEY = 'shhhh' APP_DIR = os.path.abspath(os.path.dirname(__file__)) # This directory PROJECT_ROOT = os.path.abspath(os.path.join(APP_DIR, os.pardir)) - BCRYPT_LEVEL = 13 + BCRYPT_LOG_ROUNDS = 13 DEBUG_TB_ENABLED = False # Disable Debug toolbar DEBUG_TB_INTERCEPT_REDIRECTS = False CACHE_TYPE = 'simple' # Can be "memcached", "redis", etc. class ProdConfig(Config): - '''Production configuration.''' + """Production configuration.""" ENV = 'prod' DEBUG = False SQLALCHEMY_DATABASE_URI = 'postgresql://localhost/example' @@ -21,20 +21,20 @@ class ProdConfig(Config): class DevConfig(Config): - '''Development configuration.''' + """Development configuration.""" ENV = 'dev' DEBUG = True - DB_NAME = "dev.db" + DB_NAME = 'dev.db' # Put the db file in project root DB_PATH = os.path.join(Config.PROJECT_ROOT, DB_NAME) - SQLALCHEMY_DATABASE_URI = "sqlite:///{0}".format(DB_PATH) + SQLALCHEMY_DATABASE_URI = 'sqlite:///{0}'.format(DB_PATH) DEBUG_TB_ENABLED = True ASSETS_DEBUG = True # Don't bundle/minify static assets - CACHE_TYPE = "simple" # Can be "memcached", "redis", etc. + CACHE_TYPE = 'simple' # Can be "memcached", "redis", etc. class TestConfig(Config): TESTING = True DEBUG = True SQLALCHEMY_DATABASE_URI = 'sqlite://' - BCRYPT_LEVEL = 1 + BCRYPT_LOG_ROUNDS = 1 # For faster tests