bugfix: crash on logged out landing page

This commit is contained in:
Kyle Mahan 2015-04-22 05:26:51 +00:00
parent c9e06a50fd
commit 48d0ec52e4
3 changed files with 12 additions and 4 deletions

View file

@ -6,7 +6,7 @@ from flask.ext.migrate import Migrate
db = SQLAlchemy()
micropub = MicropubClient(client_id='http://reader.kylewm.com')
micropub = MicropubClient(client_id='https://reader.kylewm.com')
login_mgr = LoginManager()
login_mgr.login_view = 'views.index'
toolbar = DebugToolbarExtension()

View file

@ -1,5 +1,6 @@
from contextlib import contextmanager
from flask import Config as FlaskConfig
from logging import StreamHandler
from redis import StrictRedis
from woodwind import util
from woodwind.models import Feed, Entry
@ -39,6 +40,12 @@ VIDEO_ENCLOSURE_TMPL = '<p><video class="u-video" src="{href}" controls '\
'preload=none ><a href="{href}">video</a></video></p>'
logger = logging.getLogger(__name__)
logger.setLevel(logging.DEBUG)
stream_handler = StreamHandler()
formatter = logging.Formatter(
'%(asctime)s - %(name)s - %(levelname)s - %(message)s')
stream_handler.setFormatter(formatter)
logger.addHandler(stream_handler)
engine = sqlalchemy.create_engine(config['SQLALCHEMY_DATABASE_URI'])
@ -89,6 +96,7 @@ def update_feed(feed_id, content=None, is_polling=True):
now = datetime.datetime.utcnow()
new_entries = []
updated_entries = []
try:
if content:
logger.info('using provided content. size=%d', len(content))
@ -136,7 +144,7 @@ def update_feed(feed_id, content=None, is_polling=True):
feed.entries.append(entry)
session.commit()
new_entries.append(entry)
(updated_entries if old else new_entries).append(entry)
else:
logger.debug(
'skipping previously seen post %s', old.permalink)
@ -148,7 +156,7 @@ def update_feed(feed_id, content=None, is_polling=True):
finally:
if is_polling:
feed.last_checked = now
if new_entries:
if new_entries or updated_entries:
feed.last_updated = now
session.commit()
if new_entries:

View file

@ -21,7 +21,7 @@ views = flask.Blueprint('views', __name__)
@views.route('/')
def index():
page = int(flask.request.args.get('page', 1))
entries = []
entry_tups = []
ws_topic = None
solo = False
all_tags = set()