saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #25792 from rallytime/bp-25688

Browse source 
Back-port #25688 to 2015.5
This commit is contained in:
Nicole Thomas 2015-07-28 13:37:17 -06:00
commit 4109ae55f9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/log/setup.py
View file

@ -121,14 +121,14 @@ class SaltLoggingClass(with_metaclass(LoggingMixInMeta, LOGGING_LOGGER_CLASS, Ne
LOGGING_TEMP_HANDLER):
continue
if not handler.lock:
handler.createLock()
handler.acquire()
formatter = handler.formatter
if not formatter:
continue
if not handler.lock:
handler.createLock()
handler.acquire()
fmt = formatter._fmt.replace('%', '%%')
match = MODNAME_PATTERN.search(fmt)