sonny/newsreader
1
0
Fork 0
Code Issues 13 Pull requests 2 Projects Releases 58 Packages Wiki Activity Actions

Fix FeedTask collecting reddit rules & update deploy job

Browse source
This commit is contained in:
Sonny Bakker 2020-08-12 19:58:59 +02:00
parent 128284dca3
commit 52a71a3f4e
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gitlab-ci/deploy.yml
View file

@ -13,7 +13,7 @@ deploy:
- echo "$DEPLOY_HOST_KEY" > /root/.ssh/known_hosts - echo "$DEPLOY_HOST_KEY" > /root/.ssh/known_hosts
- echo "$DEPLOY_KEY" > deployment/deploy_key && chmod 0600 deployment/deploy_key - echo "$DEPLOY_KEY" > deployment/deploy_key && chmod 0600 deployment/deploy_key
- mkdir /root/.vaults - mkdir /root/.vaults
- echo "$VAULT_PASSWORD" > /root/.vaults/newsreader && chmod 0600 /root/.vaults/newsreader - echo "$VAULT_PASSWORD" > /root/.vaults/newsreader
script: script:
- > - >
ansible-playbook deployment/playbook.yml ansible-playbook deployment/playbook.yml

3
src/newsreader/news/collection/tasks.py
View file

@ -8,6 +8,7 @@ from celery.utils.log import get_task_logger
from newsreader.accounts.models import User from newsreader.accounts.models import User
from newsreader.celery import app from newsreader.celery import app
from newsreader.news.collection.choices import RuleTypeChoices
from newsreader.news.collection.feed import FeedCollector from newsreader.news.collection.feed import FeedCollector
from newsreader.news.collection.utils import post from newsreader.news.collection.utils import post
from newsreader.utils.celery import MemCacheLock from newsreader.utils.celery import MemCacheLock
@ -33,7 +34,7 @@ class FeedTask(app.Task):
if acquired: if acquired:
logger.info(f"Running task for user {user_pk}") logger.info(f"Running task for user {user_pk}")
rules = user.rules.enabled() rules = user.rules.enabled().filter(type=RuleTypeChoices.feed)
collector = FeedCollector() collector = FeedCollector()
collector.collect(rules=rules) collector.collect(rules=rules)