* master:
Adding a preference to notification title only.
Adding in preference to only send full title in iOS notifications.
Forgot primary state
Adding replset oplog timing to db monitor.
* docker_django3.1:
add swarm_instructions.sh
update celery task name to cron_queue in settings.py.orig
change redis port to 6579 in docker local settings
update celery task name to cron_queue in settings.py
add image building and deployment functionality to Makefile
update docker files to include code in the image so we can use with swarm (without configuring shared volumes yet)
change beat_tasks to cron_queue in config/supervision_celeryd_beat.conf
change pymysql version in __init__ to the new django compatible version
change names for swarm service in swarm haproxy.conf file
remove ssl from nginx
fix dependency issues
change nginx check time in haproxy
add .dockerignore
update newsblur dir to newsblur_web in code
adjust resource limits on containers in stack-compose and correct monitor command
clean up and fix stack-compose.yml file
correct docker-compose images
* master:
Upgrading to mongo 3.4.
Use email if username doesnt work.
Removing old types field. Needed to upgrade to mongo 3.4.
Checking if a feed has any notifications on it, set a max of 30 min fetch (yes this is a pretty good way of getting your feeds to fetch faster, but youll have to deal with the notifications).
Fix task fetch monitor.
Attempting to see iOS premium status over email.
Handling work queue missing error.
Limiting work queue checks.
Executable monitor work queue.
Adding monitor for work queue.
Pointing to the new ssl cert.
More descriptive failure email
No default value
Spitting out error on failure.
Handling missing values
Needs redis
Only warn about falling feed fetches when actually falling.
Revert "Removing unused types key from index."
Don't need full health checks in debug.
* master:
Executable monitor work queue.
Adding monitor for work queue.
Pointing to the new ssl cert.
More descriptive failure email
No default value
Spitting out error on failure.
Handling missing values
Needs redis
Only warn about falling feed fetches when actually falling.
Revert "Removing unused types key from index."
* 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: (22 commits)
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
Changing mongodb server.
Fixing toprc
Attempting to collect queries for 1% of requests by using DEBUG.
Fixing mongo install.
Recalculating premium expiration to take into account forced expirations after gifts.
Fixing never expire -> 1 year
Adding 1 year expire to admin.
...
