valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only print exception if effective loglevel is DEBUG

Browse Source
This commit is contained in:
Erik Johnson 2014-03-04 12:55:22 -06:00
parent 803d197f34
commit 9ade2a9337
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/daemons/masterapi.py
View File

@ -38,7 +38,6 @@ import salt.utils.event
import salt.utils.verify
import salt.utils.minions
import salt.utils.gzip_util
import traceback
from salt.utils.event import tagify
from salt.exceptions import SaltMasterError
@ -155,10 +154,10 @@ def fileserver_update(fileserver):
'able to serve files to minions')
raise SaltMasterError('No fileserver backends available')
fileserver.update()
except Exception:
except Exception as exc:
log.error(
'Exception occurred in file server update:\n{0}'
.format(traceback.format_exc())
'Exception {0} occurred in file server update'.format(exc),
exc_info=log.isEnabledFor(logging.DEBUG)
)