diff --git a/PKG-INFO b/PKG-INFO index 1b74163f22a267359d5ba067d4a1628e1ad627a0..b505874f795fcc0e8c62cd568d34395faf40a1b7 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: swh.deposit -Version: 0.0.51 +Version: 0.0.52 Summary: Software Heritage Deposit Server Home-page: https://forge.softwareheritage.org/source/swh-deposit/ Author: Software Heritage developers diff --git a/debian/control b/debian/control index 4d986c114e1bf74078b55992bc702b35e99229fe..fab46535ebbd8d07f76a4db7a76d350fe6cb916b 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9), python3-swh.model (>= 0.0.21~), python3-swh.loader.core (>= 0.0.32~), python3-swh.loader.tar (>= 0.0.35~), - python3-swh.scheduler (>= 0.0.19~), + python3-swh.scheduler (>= 0.0.26~), python3-django, python3-click, python3-vcversioner, @@ -29,7 +29,7 @@ Package: python3-swh.deposit Architecture: all Depends: python3-swh.core (>= 0.0.36~), python3-swh.model (>= 0.0.21~), - python3-swh.scheduler (>= 0.0.19~), + python3-swh.scheduler (>= 0.0.26~), patool, ${misc:Depends}, ${python3:Depends} Description: Software Heritage Deposit Server @@ -51,6 +51,6 @@ Depends: python3-swh.deposit.client (= ${binary:Version}), python3-swh.model (>= 0.0.21~), python3-swh.loader.core (>= 0.0.32~), python3-swh.loader.tar (>= 0.0.35~), - python3-swh.scheduler (>= 0.0.19~), + python3-swh.scheduler (>= 0.0.26~), ${misc:Depends}, ${python3:Depends} Description: Software Heritage Deposit Loader diff --git a/requirements-swh.txt b/requirements-swh.txt index 4a51cbcf6d60bbadd8dcea5ec86f0a3ae3fce489..1f63fe7e2555812dc4f0035091c9f2f62dcf10d1 100644 --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,5 +1,5 @@ swh.core >= 0.0.36 swh.loader.tar >= 0.0.35 swh.loader.core >= 0.0.32 -swh.scheduler >= 0.0.19 +swh.scheduler >= 0.0.26 swh.model >= 0.0.21 diff --git a/swh.deposit.egg-info/PKG-INFO b/swh.deposit.egg-info/PKG-INFO index 1b74163f22a267359d5ba067d4a1628e1ad627a0..b505874f795fcc0e8c62cd568d34395faf40a1b7 100644 --- a/swh.deposit.egg-info/PKG-INFO +++ b/swh.deposit.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: swh.deposit -Version: 0.0.51 +Version: 0.0.52 Summary: Software Heritage Deposit Server Home-page: https://forge.softwareheritage.org/source/swh-deposit/ Author: Software Heritage developers diff --git a/swh.deposit.egg-info/requires.txt b/swh.deposit.egg-info/requires.txt index dcc067a0efd86a52d40b87902d5fd9ef2f82d89a..963df3d6424975f3e297246c45576ec2289b6778 100644 --- a/swh.deposit.egg-info/requires.txt +++ b/swh.deposit.egg-info/requires.txt @@ -7,5 +7,5 @@ swh.core>=0.0.36 swh.loader.core>=0.0.32 swh.loader.tar>=0.0.35 swh.model>=0.0.21 -swh.scheduler>=0.0.19 +swh.scheduler>=0.0.26 vcversioner diff --git a/swh/deposit/config.py b/swh/deposit/config.py index d3a1a8aefa425e5b41bd4d1f561eb05fdce08be2..999a20ae8444a8218b3db0f5577e5f26767e568a 100644 --- a/swh/deposit/config.py +++ b/swh/deposit/config.py @@ -7,6 +7,7 @@ import os import logging from swh.core.config import SWHConfig +from swh.scheduler import get_scheduler # IRIs (Internationalized Resource identifier) sword 2.0 specified EDIT_SE_IRI = 'edit_se_iri' @@ -78,6 +79,12 @@ class SWHDefaultConfig(SWHConfig): DEFAULT_CONFIG = { 'max_upload_size': ('int', 209715200), 'checks': ('bool', True), + 'scheduler': ('dict', { + 'cls': 'remote', + 'args': { + 'url': 'http://localhost:5008/' + } + }) } ADDITIONAL_CONFIG = {} @@ -89,5 +96,4 @@ class SWHDefaultConfig(SWHConfig): self.config.update(config) self.log = logging.getLogger('swh.deposit') if self.config['checks']: - from swh.scheduler.backend import SchedulerBackend - self.scheduler = SchedulerBackend() + self.scheduler = get_scheduler(**self.config['scheduler']) diff --git a/swh/deposit/loader/scheduler.py b/swh/deposit/loader/scheduler.py index e5f38a15124919a82c8f95de8655231a05ff7bc5..bc2713c66688699b0b9e8f3559b1d4258e6f2da0 100644 --- a/swh/deposit/loader/scheduler.py +++ b/swh/deposit/loader/scheduler.py @@ -103,15 +103,22 @@ class SWHSchedulerScheduling(SWHScheduling): """Deposit loading through SWH's task scheduling interface. """ - ADDITIONAL_CONFIG = {} + ADDITIONAL_CONFIG = { + 'scheduler': ('dict', { + 'cls': 'remote', + 'args': { + 'url': 'http://localhost:5008', + } + }) + } def __init__(self, config=None): super().__init__() - from swh.scheduler.backend import SchedulerBackend + from swh.scheduler import get_scheduler if config: self.config.update(**config) self.dry_run = self.config['dry_run'] - self.scheduler = SchedulerBackend(**self.config) + self.scheduler = get_scheduler(**self.config['scheduler']) self.check = self.config['check'] def _convert(self, deposits): diff --git a/swh/deposit/settings/development.py b/swh/deposit/settings/development.py index bc39dca58e5ad2cc00a5b28ba559757c9d62deae..04823686e93a13a329213617cdb21f2d16ca1962 100644 --- a/swh/deposit/settings/development.py +++ b/swh/deposit/settings/development.py @@ -14,7 +14,7 @@ SECRET_KEY = 'development-key' # https://docs.djangoproject.com/en/1.10/ref/settings/#logging LOGGING = { 'version': 1, - 'disable_existing_loggers': True, + 'disable_existing_loggers': False, 'formatters': { 'standard': { 'format': "[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s", # noqa diff --git a/version.txt b/version.txt index f548cb09a648eb2812930fda7f77456f07ec2fc7..667e1ddafecec182278eac94af0bfc121ebf67cc 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v0.0.51-0-g735b248 \ No newline at end of file +v0.0.52-0-g7e535ab \ No newline at end of file