From 48d0ec52e4f82b92f61b2cceda0bc10965ed991f Mon Sep 17 00:00:00 2001
From: Kyle Mahan <kyle.mahan@gmail.com>
Date: Wed, 22 Apr 2015 05:26:51 +0000
Subject: [PATCH] bugfix: crash on logged out landing page

---
 woodwind/extensions.py |  2 +-
 woodwind/tasks.py      | 12 ++++++++++--
 woodwind/views.py      |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/woodwind/extensions.py b/woodwind/extensions.py
index 44e8b1f..0161a6d 100644
--- a/woodwind/extensions.py
+++ b/woodwind/extensions.py
@@ -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()
diff --git a/woodwind/tasks.py b/woodwind/tasks.py
index c256969..2b73a90 100644
--- a/woodwind/tasks.py
+++ b/woodwind/tasks.py
@@ -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:
diff --git a/woodwind/views.py b/woodwind/views.py
index 6f7ff91..8a24943 100644
--- a/woodwind/views.py
+++ b/woodwind/views.py
@@ -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()