From 506c2cdf99adcdb900d880b3d64ba5328a25b633 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Mon, 1 Jul 2013 11:50:30 -0700 Subject: [PATCH] Handling unread story marking where story cna't be found. --- apps/reader/views.py | 4 ++++ fabfile.py | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/apps/reader/views.py b/apps/reader/views.py index ba17361ac..7a88ce0ba 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -1095,6 +1095,10 @@ def mark_story_as_unread(request): story, found_original = MStory.find_story(feed_id, story_id) + if not story: + logging.user(request, "~FY~SBUnread~SN story in feed: %s (NOT FOUND)" % (feed)) + return dict(code=-1, message="Story not found.") + if usersub and story.story_date < usersub.mark_read_date: # Story is outside the mark as read range, so invert all stories before. newer_stories = MStory.objects(story_feed_id=story.story_feed_id, diff --git a/fabfile.py b/fabfile.py index 648da872f..364230b75 100644 --- a/fabfile.py +++ b/fabfile.py @@ -252,6 +252,12 @@ def setup_task(queue=None, skip_common=False): config_monit_task() done() +def setup_task_image(): + copy_task_settings() + setup_hosts() + config_pgbouncer() + deploy() + # ================== # = Setup - Common = # ==================