opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 02:04:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove user IDs from job names

Browse Source
This commit is contained in:
E Rasche
2018-05-01 12:05:28 +02:00
parent d23bb5689e
commit 6872325d80
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/runners/__init__.py
+2 -1
View File
@@ -75,6 +75,7 @@ class BaseJobRunner(object):
log.debug('Loading %s with params: %s', self.runner_name, kwargs)
self.runner_params = RunnerParams(specs=runner_param_specs, params=kwargs)
self.runner_state_handlers = build_state_handlers()
self.gdpr_compliant = self.app.config.gdpr_compliance_mode
def _init_worker_threads(self):
"""Start ``nworkers`` worker threads.
@@ -464,7 +465,7 @@ class JobState(object):
job_name = 'g%s' % id_tag
if self.job_wrapper.tool.old_id:
job_name += '_%s' % self.job_wrapper.tool.old_id
if self.job_wrapper.user:
if not self.gdpr_compliant and self.job_wrapper.user:
job_name += '_%s' % self.job_wrapper.user
self.job_name = ''.join(x if x in (string.ascii_letters + string.digits + '_') else '_' for x in job_name)
lib/galaxy/jobs/runners/drmaa.py
+2 -1
View File
@@ -92,6 +92,7 @@ class DRMAAJobRunner(AsynchronousJobRunner):
self._init_monitor_thread()
self._init_worker_threads()
self.gdpr_compliant = self.app.config.gdpr_compliance_mode
def url_to_destination(self, url):
"""Convert a legacy URL to a job destination"""
@@ -389,7 +390,7 @@ class DRMAAJobRunner(AsynchronousJobRunner):
job_name = 'g%s' % galaxy_id_tag
if job_wrapper.tool.old_id:
job_name += '_%s' % job_wrapper.tool.old_id
if external_runjob_script is None:
if not self.gdpr_compliant and external_runjob_script is None:
job_name += '_%s' % job_wrapper.user
job_name = ''.join(x if x in (string.ascii_letters + string.digits + '_') else '_' for x in job_name)
if self.restrict_job_name_length: