Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Import job properly. #1626

Merged
merged 2 commits into from
Aug 16, 2017
Merged

Import job properly. #1626

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
756cb7a
Import job properly.
teleyinex Aug 16, 2017
eb4866a
Add it to all jobs list.
teleyinex Aug 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pybossa/jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from pybossa.model.webhook import Webhook
from pybossa.util import with_cache_disabled, publish_channel
import pybossa.dashboard.jobs as dashboard
import pybossa.leaderboard.jobs as leaderboard
from pybossa.leaderboard.jobs import leaderboard
from pbsonesignal import PybossaOneSignal


Expand Down Expand Up @@ -118,7 +118,7 @@ def get_periodic_jobs(queue):
failed_jobs = get_maintenance_jobs() if queue == 'maintenance' else []
_all = [zip_jobs, jobs, project_jobs, autoimport_jobs,
engage_jobs, non_contrib_jobs, dashboard_jobs,
weekly_update_jobs, failed_jobs]
weekly_update_jobs, failed_jobs, leaderboard_jobs]
return (job for sublist in _all for job in sublist if job['queue'] == queue)


Expand Down Expand Up @@ -276,7 +276,7 @@ def get_dashboard_jobs(queue='low'): # pragma: no cover
def get_leaderboard_jobs(queue='super'): # pragma: no cover
"""Return leaderboard jobs."""
timeout = current_app.config.get('TIMEOUT')
yield dict(name=leaderboard.leaderboard, args=[], kwargs={},
yield dict(name=leaderboard, args=[], kwargs={},
timeout=timeout, queue=queue)


Expand Down