Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

If the queue is set, return it. #55845

Merged
merged 1 commit into from
Jan 13, 2020
+3 −0
Merged

If the queue is set, return it. #55845

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions salt/log/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down