Merge pull request #9705 from mvdbeek/fix_unit_test_error

doc/source/lib/galaxy.util.logging.rst

@@ -1,7 +1,7 @@
-galaxy.util.logging package
+galaxy.util.custom_logging package
 ===========================
 
-.. automodule:: galaxy.util.logging
+.. automodule:: galaxy.util.custom_logging
     :members:
     :undoc-members:
     :show-inheritance:
@@ -9,10 +9,10 @@ galaxy.util.logging package
 Submodules
 ----------
 
-galaxy.util.logging.fluent\_log module
+galaxy.util.custom_logging.fluent\_log module
 --------------------------------------
 
-.. automodule:: galaxy.util.logging.fluent_log
+.. automodule:: galaxy.util.custom_logging.fluent_log
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/lib/galaxy.util.rst

@@ -11,7 +11,7 @@ Subpackages
 
 .. toctree::
 
-    galaxy.util.logging
+    galaxy.util.custom_logging
     galaxy.util.pastescript
     galaxy.util.path
     galaxy.util.tool_shed

lib/galaxy/app.py

@@ -318,7 +318,7 @@ class UniverseApplication(config.ConfiguresGalaxyMixin):
 
     def configure_fluent_log(self):
         if self.config.fluent_log:
-            from galaxy.util.logging.fluent_log import FluentTraceLogger
+            from galaxy.util.custom_logging.fluent_log import FluentTraceLogger
             self.trace_logger = FluentTraceLogger('galaxy', self.config.fluent_host, self.config.fluent_port)
         else:
             self.trace_logger = None

lib/galaxy/config/__init__.py

@@ -37,8 +37,8 @@ from galaxy.util import (
     string_as_bool,
     unicodify,
 )
+from galaxy.util.custom_logging import LOGLV_TRACE
 from galaxy.util.dbkeys import GenomeBuilds
-from galaxy.util.logging import LOGLV_TRACE
 from galaxy.util.properties import (
     find_config_file,
     read_properties_from_file,

lib/galaxy/jobs/actions/post.py

@@ -11,7 +11,7 @@ from galaxy.util import (
     send_mail,
     unicodify,
 )
-from galaxy.util.logging import get_logger
+from galaxy.util.custom_logging import get_logger
 
 log = get_logger(__name__)
 

lib/galaxy/jobs/handler.py

@@ -28,7 +28,7 @@ from galaxy.jobs import (
 )
 from galaxy.jobs.mapper import JobNotReadyException
 from galaxy.util import unicodify
-from galaxy.util.logging import get_logger
+from galaxy.util.custom_logging import get_logger
 from galaxy.util.monitors import Monitors
 from galaxy.web_stack.handlers import HANDLER_ASSIGNMENT_METHODS
 from galaxy.web_stack.message import JobHandlerMessage

lib/galaxy/jobs/runners/__init__.py

@@ -38,7 +38,7 @@ from galaxy.util import (
     unicodify,
 )
 from galaxy.util.bunch import Bunch
-from galaxy.util.logging import get_logger
+from galaxy.util.custom_logging import get_logger
 from galaxy.util.monitors import Monitors
 from .state_handler_factory import build_state_handlers
 

lib/galaxy/jobs/runners/slurm.py

@@ -11,7 +11,7 @@ import time
 from galaxy import model
 from galaxy.jobs.runners.drmaa import DRMAAJobRunner
 from galaxy.util import unicodify
-from galaxy.util.logging import get_logger
+from galaxy.util.custom_logging import get_logger
 
 log = get_logger(__name__)
 

lib/galaxy/util/__init__.py

@@ -65,8 +65,8 @@ try:
 except ImportError:
     uwsgi = None
 
+from .custom_logging import get_logger
 from .inflection import English, Inflector
-from .logging import get_logger
 from .path import safe_contains, safe_makedirs, safe_relpath  # noqa: F401
 
 inflector = Inflector(English)

lib/galaxy/workflow/scheduling_manager.py

@@ -6,7 +6,7 @@ import galaxy.workflow.schedulers
 from galaxy import model
 from galaxy.exceptions import HandlerAssignmentError
 from galaxy.util import plugin_config
-from galaxy.util.logging import get_logger
+from galaxy.util.custom_logging import get_logger
 from galaxy.util.monitors import Monitors
 from galaxy.web_stack.handlers import ConfiguresHandlers, HANDLER_ASSIGNMENT_METHODS
 from galaxy.web_stack.message import WorkflowSchedulingMessage

packages/util/setup.py

@@ -33,7 +33,7 @@ PACKAGES = [
     'galaxy',
     'galaxy.exceptions',
     'galaxy.util',
-    'galaxy.util.logging',
+    'galaxy.util.custom_logging',
     'galaxy.util.path',
 ]
 ENTRY_POINTS = '''