diff --git a/selfprivacy_api/actions/services.py b/selfprivacy_api/actions/services.py index 56d35e9..ebb0917 100644 --- a/selfprivacy_api/actions/services.py +++ b/selfprivacy_api/actions/services.py @@ -30,7 +30,5 @@ def move_service(service_id: str, volume_name: str) -> Job: description=f"Moving {service.get_display_name()} data to {volume.name}", ) - handle = move_service_task(service, volume, job) - # Nonblocking - handle() + move_service_task(service, volume, job) return job diff --git a/selfprivacy_api/graphql/mutations/services_mutations.py b/selfprivacy_api/graphql/mutations/services_mutations.py index 97eb4d9..be0cb77 100644 --- a/selfprivacy_api/graphql/mutations/services_mutations.py +++ b/selfprivacy_api/graphql/mutations/services_mutations.py @@ -5,7 +5,6 @@ import strawberry from selfprivacy_api.graphql import IsAuthenticated from selfprivacy_api.graphql.common_types.jobs import job_to_api_job from selfprivacy_api.jobs import JobStatus -from selfprivacy_api.utils.block_devices import BlockDevices from traceback import format_tb as format_traceback @@ -23,7 +22,6 @@ from selfprivacy_api.actions.services import ( ServiceNotFoundError, VolumeNotFoundError, ) -from selfprivacy_api.services.moving import MoveError from selfprivacy_api.services import get_service_by_id diff --git a/selfprivacy_api/jobs/__init__.py b/selfprivacy_api/jobs/__init__.py index 7f46e9d..4649bb0 100644 --- a/selfprivacy_api/jobs/__init__.py +++ b/selfprivacy_api/jobs/__init__.py @@ -268,10 +268,12 @@ class Jobs: return False -# A terse way to call a common operation, for readability -# job.report_progress() would be even better -# but it would go against how this file is written def report_progress(progress: int, job: Job, status_text: str) -> None: + """ + A terse way to call a common operation, for readability + job.report_progress() would be even better + but it would go against how this file is written + """ Jobs.update( job=job, status=JobStatus.RUNNING,