Merge pull request #55845 from s0undt3ch/features/pytest-master-6

If the queue is set, return it.
saltstack · Jan 13, 2020 · 07addbb · 07addbb
2 parents 224fb88 + 47db79e
commit 07addbb
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/salt/log/setup.py b/salt/log/setup.py
@@ -484,6 +484,9 @@ def get_multiprocessing_logging_queue():
     global __MP_LOGGING_QUEUE
     from salt.utils.platform import is_darwin
 
+    if __MP_LOGGING_QUEUE is not None:
+        return __MP_LOGGING_QUEUE
+
     if __MP_IN_MAINPROCESS is False:
         # We're not in the MainProcess, return! No Queue shall be instantiated
         return __MP_LOGGING_QUEUE