public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allowing S3 to be turned off and on again.

Browse source
This commit is contained in:
Samuel Clay 2012-12-10 11:13:45 -08:00
parent 216a724717
commit 2b5a13ce8c
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/rss_feeds/page_importer.py
View file

@ -189,13 +189,12 @@ class PageImporter(object):
k.set_contents_from_string(compressed_html) k.set_contents_from_string(compressed_html)
k.set_acl('public-read') k.set_acl('public-read')
if not self.feed.s3_page: try:
try: feed_page = MFeedPage.objects.get(feed_id=self.feed.pk)
feed_page = MFeedPage.objects.get(feed_id=self.feed.pk) feed_page.delete()
feed_page.delete() logging.debug(' --->> [%-30s] ~FYTransfering page data to S3...' % (self.feed))
logging.debug(' --->> [%-30s] ~FYTransfering page data to S3...' % (self.feed)) except MFeedPage.DoesNotExist:
except MFeedPage.DoesNotExist: pass
pass
self.feed.s3_page = True self.feed.s3_page = True
self.feed.save() self.feed.save()

6
settings.py
View file

@ -519,5 +519,7 @@ if DEBUG:
S3_CONN = None S3_CONN = None
if BACKED_BY_AWS.get('pages_on_s3') or BACKED_BY_AWS.get('icons_on_s3'): if BACKED_BY_AWS.get('pages_on_s3') or BACKED_BY_AWS.get('icons_on_s3'):
S3_CONN = S3Connection(S3_ACCESS_KEY, S3_SECRET) S3_CONN = S3Connection(S3_ACCESS_KEY, S3_SECRET)
S3_PAGES_BUCKET = S3_CONN.get_bucket(S3_PAGES_BUCKET_NAME) if BACKED_BY_AWS.get('pages_on_s3'):
S3_ICONS_BUCKET = S3_CONN.get_bucket(S3_ICONS_BUCKET_NAME) S3_PAGES_BUCKET = S3_CONN.get_bucket(S3_PAGES_BUCKET_NAME)
if BACKED_BY_AWS.get('icons_on_s3'):
S3_ICONS_BUCKET = S3_CONN.get_bucket(S3_ICONS_BUCKET_NAME)