diff --git a/local_settings.py.template b/local_settings.py.template index 3314a5f50..4adfe6b96 100644 --- a/local_settings.py.template +++ b/local_settings.py.template @@ -79,8 +79,8 @@ MONGODB_SLAVE = { } # Celery RabbitMQ/Redis Broker -CELERY_REDIS_HOST = "127.0.0.1" BROKER_URL = "redis://127.0.0.1:6379/0" +CELERY_RESULT_BACKEND = BROKER_URL REDIS = { 'host': '127.0.0.1', diff --git a/media/ios/NewsBlur_Prefix.pch b/media/ios/NewsBlur_Prefix.pch index c5166461a..1aca75e15 100644 --- a/media/ios/NewsBlur_Prefix.pch +++ b/media/ios/NewsBlur_Prefix.pch @@ -10,8 +10,8 @@ // #define BACKGROUND_REFRESH_SECONDS -5 #define BACKGROUND_REFRESH_SECONDS -10*60 -// #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.com"] - #define NEWSBLUR_URL [NSString stringWithFormat:@"www.newsblur.com"] + #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.com"] +// #define NEWSBLUR_URL [NSString stringWithFormat:@"www.newsblur.com"] #define NEWSBLUR_LINK_COLOR 0x405BA8 #define NEWSBLUR_HIGHLIGHT_COLOR 0xd2e6fd diff --git a/settings.py b/settings.py index 7bfa43802..66d82eb86 100644 --- a/settings.py +++ b/settings.py @@ -314,7 +314,7 @@ CELERY_QUEUES = { CELERY_DEFAULT_QUEUE = "work_queue" BROKER_BACKEND = "redis" BROKER_URL = "redis://db01:6379/0" -CELERY_REDIS_HOST = "db01" +CELERY_RESULT_BACKEND = BROKER_URL CELERYD_PREFETCH_MULTIPLIER = 1 CELERY_IMPORTS = ("apps.rss_feeds.tasks", diff --git a/utils/feed_fetcher.py b/utils/feed_fetcher.py index 67869018a..7fc983322 100644 --- a/utils/feed_fetcher.py +++ b/utils/feed_fetcher.py @@ -58,7 +58,7 @@ class FetchFeed: modified = None etag = None - USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/536.2.3 (KHTML, like Gecko) Version/5.2 (NewsBlur Feed Fetcher - %s subscriber%s - %s)' % ( + USER_AGENT = 'NewsBlur Feed Fetcher - %s subscriber%s - %s (Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/536.2.3 (KHTML, like Gecko) Version/5.2)' % ( self.feed.num_subscribers, 's' if self.feed.num_subscribers != 1 else '', settings.NEWSBLUR_URL