Merge branch 'release_18.05' into release_18.09

galaxyproject · Jan 9, 2019 · c4ad6b9 · c4ad6b9
2 parents ce1a1ee + 2a17860
commit c4ad6b9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/galaxy/jobs/runners/slurm.py b/lib/galaxy/jobs/runners/slurm.py
@@ -1,7 +1,6 @@
 """
 SLURM job control via the DRMAA API.
 """
-import logging
 import os
 import re
 import shutil
@@ -11,8 +10,9 @@
 
 from galaxy import model
 from galaxy.jobs.runners.drmaa import DRMAAJobRunner
+from galaxy.util.logging import get_logger
 
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
 
 __all__ = ('SlurmJobRunner', )