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

Accidentally running full aggregation on chunks and not end of pipeline.

Browse source
This commit is contained in:
Samuel Clay 2022-06-23 17:50:47 -04:00
parent c38fcc59cf
commit f459944b88
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/reader/models.py
View file

@ -201,8 +201,6 @@ class UserSubscription(models.Model):
results = pipeline.execute() results = pipeline.execute()
if store_stories_key:
r.zunionstore(store_stories_key, unread_ranked_stories_keys, aggregate="MAX")
for hashes in results: for hashes in results:
if not isinstance(hashes, list): continue if not isinstance(hashes, list): continue
@ -211,6 +209,9 @@ class UserSubscription(models.Model):
feed_counter += 1 feed_counter += 1
else: else:
story_hashes.extend(hashes) story_hashes.extend(hashes)
if store_stories_key:
r.zunionstore(store_stories_key, unread_ranked_stories_keys, aggregate="MAX")
return story_hashes return story_hashes

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

@ -146,6 +146,14 @@ backend sentry
server {{host}} {{host}}.node.nyc1.consul:9000 server {{host}} {{host}}.node.nyc1.consul:9000
{% endfor %} {% endfor %}
backend staging
balance roundrobin
option httpchk GET /_haproxychk
default-server check inter 2000ms resolvers consul resolve-prefer ipv4 resolve-opts allow-dup-ip init-addr none
{% for host in groups.staging %}
server {{host}} {{host}}.node.nyc1.consul:8000
{% endfor %}
backend node_images backend node_images
option httpchk HEAD /sc,seLJDaKBog3LLEMDe8cjBefMhnVSibO4RA5boZhWcVZ0=/https://samuelclay.com/static/images/2019%20-%20Cuba.jpg option httpchk HEAD /sc,seLJDaKBog3LLEMDe8cjBefMhnVSibO4RA5boZhWcVZ0=/https://samuelclay.com/static/images/2019%20-%20Cuba.jpg
http-check expect rstatus 200|301 http-check expect rstatus 200|301