Page MenuHomeSoftware Heritage

D364.id1210.diff
No OneTemporary

D364.id1210.diff

diff --git a/swh/lister/core/tasks.py b/swh/lister/core/tasks.py
--- a/swh/lister/core/tasks.py
+++ b/swh/lister/core/tasks.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 the Software Heritage developers
+# Copyright (C) 2017-2018 the Software Heritage developers
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
@@ -39,34 +39,35 @@
task_queue = AbstractAttribute('Celery Task queue name')
@abc.abstractmethod
- def new_lister(self):
+ def new_lister(self, *args, **kwargs):
"""Return a new lister of the appropriate type.
"""
pass
@abc.abstractmethod
- def run_task(self):
+ def run_task(self, *args, **kwargs):
pass
class IndexingDiscoveryListerTask(ListerTaskBase):
- def run_task(self):
- lister = self.new_lister()
+ def run_task(self, *args, **kwargs):
+ lister = self.new_lister(*args, **kwargs)
return lister.run(min_index=lister.db_last_index(), max_index=None)
class IndexingRangeListerTask(ListerTaskBase):
- def run_task(self, start, end):
- lister = self.new_lister()
+ def run_task(self, start, end, *args, **kwargs):
+ lister = self.new_lister(*args, **kwargs)
return lister.run(min_index=start, max_index=end)
class IndexingRefreshListerTask(ListerTaskBase):
GROUP_SPLIT = 10000
- def run_task(self):
- lister = self.new_lister()
+ def run_task(self, *args, **kwargs):
+ lister = self.new_lister(*args, **kwargs)
ranges = lister.db_partition_indices(self.GROUP_SPLIT)
random.shuffle(ranges)
range_task = IndexingRangeListerTask()
- group(range_task.s(minv, maxv) for minv, maxv in ranges)()
+ group(range_task.s(minv, maxv, *args, **kwargs)
+ for minv, maxv in ranges)()
diff --git a/swh/lister/gitlab/tasks.py b/swh/lister/gitlab/tasks.py
--- a/swh/lister/gitlab/tasks.py
+++ b/swh/lister/gitlab/tasks.py
@@ -10,9 +10,10 @@
class GitLabDotComListerTask(ListerTaskBase):
- def new_lister(self):
- return GitLabLister(lister_name='gitlab.com',
- api_baseurl='https://gitlab.com/api/v4')
+ def new_lister(self, lister_name='gitlab.com',
+ api_baseurl='https://gitlab.com/api/v4'):
+ return GitLabLister(
+ lister_name=lister_name, api_baseurl=api_baseurl)
class IncrementalGitLabDotComLister(GitLabDotComListerTask,

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 2, 10:34 AM (2 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3221459

Event Timeline