Skip to content

Commit

Permalink
yep
Browse files Browse the repository at this point in the history
  • Loading branch information
jaesivsm committed Feb 21, 2018
1 parent 7bb8cc4 commit edabfc3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion jarr/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def is_secure_served():


def init_logging(log_path=None, log_level=logging.INFO, modules=(),
log_format='%(asctime)s %(levelname)s %(message)s'):
log_format='%(asctime)s %(levelname)s %(message)s'):

if not modules:
modules = ('root', 'wsgi', 'manager',
Expand Down Expand Up @@ -123,6 +123,7 @@ def init_models():
PARSED_PLATFORM_URL = urlparse(conf.platform_url)

init_logging(conf.log.path, log_level=conf.log.level)
init_logging(conf.log.path, log_level=logging.WARNING, modules=('the_conf',))
engine, session, Base = init_db(SQLITE_ENGINE)
article_parsing, feed_creation, entry_parsing, _ = init_integrations()
init_models()
5 changes: 4 additions & 1 deletion wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ def session_clear(exception=None):


def create_app():
app = Flask(__name__, template_folder="jarr/templates")
print(__name__)
app = Flask(__name__,
static_folder='jarr/views/static',
template_folder="jarr/templates")
app.config.from_object(conf)
if conf.jarr_testing:
app.debug = True
Expand Down

0 comments on commit edabfc3

Please sign in to comment.