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

Adding attributes to feeds when the attrs show up when returning the feed (happens for un-subbed feed).

Browse source
This commit is contained in:
Samuel Clay 2016-05-23 19:28:01 -07:00
parent d0a191e556
commit de6b7fc5cf
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fabfile.py vendored
View file

@ -1686,4 +1686,8 @@ def upgrade_to_virtualenv(role=None):
setup_db_search()
elif role == "work":
enable_celerybeat()
sudo('reboot')
sudo('reboot')
def stress_test():
sudo('apt-get install -y sysbench')
run('sysbench --test=cpu --cpu-max-prime=20000 run')

10
media/js/newsblur/common/assetmodel.js
View file

@ -578,6 +578,16 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
this.flags['no_more_stories'] = true;
this.stories.trigger('no_more_stories');
}
var attrs = {};
var feed_attrs = ["num_subscribers", "is_push", "min_to_decay", "favicon_color", "favicon_border", "favicon_fade", "favicon_textg_color", "updated_seconds_ago"];
for (var attr in feed_attrs) {
var feed_attr = feed_attrs[attr];
if (data[feed_attr] || !_.isUndefined(data[feed_attr])) {
attrs[feed_attr] = data[feed_attr];
}
}
if (this.active_feed) this.active_feed.set(attrs);
$.isFunction(callback) && callback(data, first_load);
}
},

2
templates/maintenance_off.html
View file

@ -85,7 +85,7 @@
<img src="/media/img/logo_512.png" class="logo">
<h1>NewsBlur is in <span class="error404">maintenance mode</span></h1>
<div class="description">
<p>Power cycling the PostgreSQL DB to fix a lag that is inexplicable. This should take no longer than two minutes.</p>
<p>Power cycling the MongoDB primary database due to resource content that's causing everything to slow down. This should take 2-3 minutes.</p>
<p>To pass the time, <a href="http://mlkshk.com/popular">check out what's popular on MLKSHK</a>.</p>
</div>
</div>