* docker_django3.1: (117 commits)
Adding docker to node scripts.
Removing node_modules from repo
Whoops
Better logging for broken paypal ipns.
Adding RSS Tracker for Windows to Goodies.
Refactoring socketio so real-time works around username restrictions.
Socket.IO v3 on the server too.
Switching to Socket.IO v3.
Haproxy splitting for socketio 3
Socket.io 3
Handling missing feed.
Only nb.local.com uses ports for websockets.
Adding GrazeTEN
Full node install on setup.
Updating toprc
correct newsblur to newsblur_web in tasks
Changing mongodb server.
Fixing toprc
Attempting to collect queries for 1% of requests by using DEBUG.
Fixing mongo install.
...
* master:
Adding task servers to db firewall.
Adding redis cache. Returning favicon server.
Better munin plugins for redis and mongo.
Removing unused redis keys for shared/comments. Dry-run.
Adding read preference to migration.
Migration to create story_hash for missing feeds.
Making a clearer description of slow feeds.
Upping feed fetches, slowing down fetch interval for less active feeds, setting premium expire time to one year from most recent payment date (as opposed to borked payment gap logic), and adding logginf or tasking feeds.
Switching check for HAProxy'ied socket.io to dev instead of www. Thanks @anaconda!
Sync delay in mongodb and updating story hash migration.
Upping feed fetches.
Fix force close when attempting to fetch a user with a null user.id value
Fix force close updating ProfileActivityFragment if no profile response was received
Move creating ImageLoader in NewsBlurApplication to onCreate to ensure that base context has been set and prevent force close
Boosting fetches.
Fix duplicate requirement
Conflicts:
fabfile.py
