public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-04-13 09:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into pro

Browse source 
* master:
  All app servers go to the  size.
  Handling missing hub.challenge when hub sends a 404 back. (from https://www.lifehate.it/feed)
  Only DEBUG_QUERIES are needed to debug queries.
This commit is contained in:
Samuel Clay 2022-05-11 11:30:11 -04:00
commit 4445d3c52e
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/profile/middleware.py
View file

@ -181,8 +181,7 @@ class SQLLogToConsoleMiddleware:
query['sql'] = re.sub(r'DELETE', '~FR~SBDELETE', query['sql'])
if (
settings.DEBUG
and settings.DEBUG_QUERIES
settings.DEBUG_QUERIES
and not getattr(settings, 'DEBUG_QUERIES_SUMMARY_ONLY', False)
):
t = Template(

2
apps/push/views.py
View file

@ -17,7 +17,7 @@ def push_callback(request, push_id):
if request.method == 'GET':
mode = request.GET['hub.mode']
topic = request.GET['hub.topic']
challenge = request.GET['hub.challenge']
challenge = request.GET.get('hub.challenge', '')
lease_seconds = request.GET.get('hub.lease_seconds')
verify_token = request.GET.get('hub.verify_token', '')

2
docker/haproxy/haproxy.consul.cfg.j2
View file

@ -235,7 +235,7 @@ backend maintenance
option httpchk HEAD /maintenance
http-check expect status 404
http-check send-state
server maintenance app-counts1.node.nyc1.consul:80 check inter 2000ms resolvers consul resolve-prefer ipv4 resolve-opts allow-dup-ip init-addr none
server maintenance app-django1.node.nyc1.consul:80 check inter 2000ms resolvers consul resolve-prefer ipv4 resolve-opts allow-dup-ip init-addr none
listen stats
bind :1936 ssl crt {{ ssl_certificate }}

6
terraform/digitalocean.tf
View file

@ -107,7 +107,7 @@ resource "digitalocean_droplet" "app-django" {
image = var.droplet_os
name = "app-django${count.index+1}"
region = var.droplet_region
size = var.droplet_size_10
size = var.droplet_size_15
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/utils/generate_inventory.py; sleep 120"
@ -125,7 +125,7 @@ resource "digitalocean_droplet" "app-counts" {
image = var.droplet_os
name = "app-counts${count.index+1}"
region = var.droplet_region
size = var.droplet_size
size = var.droplet_size_15
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/utils/generate_inventory.py; sleep 120"
@ -161,7 +161,7 @@ resource "digitalocean_droplet" "app-refresh" {
image = var.droplet_os
name = "app-refresh${count.index+1}"
region = var.droplet_region
size = var.droplet_size_10
size = var.droplet_size_15
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/utils/generate_inventory.py; sleep 120"