Merge remote-tracking branch 'origin/logcabin'

Conflicts:
	application.py
	requirements.txt
This commit is contained in:
yackob03 2014-01-31 19:33:38 -05:00
commit cd1e1ec3b0
27 changed files with 233 additions and 203 deletions

View file

@ -1,15 +1,16 @@
import logging
import os
from app import app as application
from data.model import db as model_db
logging.basicConfig(**application.config['LOGGING_CONFIG'])
# Initialize logging
application.config['LOGGING_CONFIG']()
# Turn off debug logging for boto
logging.getLogger('boto').setLevel(logging.CRITICAL)
from endpoints.api import api
from endpoints.index import index
from endpoints.web import web