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 4

Fixing changelog. Removing unneeded log message.

Browse source
This commit is contained in:
Gareth J. Greenaway 2021-07-29 08:58:22 -07:00 • committed by Megan Wilhite
parent bb4e073cef
commit 142c2e7867
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog/60585.fixed
View file

@ -1,2 +1,2 @@
Have the beacon call run through a try...except, catching any errors, logging and firing an event that includes the error.
Fixing the swapusage beacon to ensure value is a tring before we attempt to filter out the %.
Fixing the swapusage beacon to ensure value is a string before we attempt to filter out the %.

1
salt/beacons/__init__.py
View file

@ -128,7 +128,6 @@ class Beacon:
# Fire the beacon!
error = None
try:
log.debug(self.beacons[fun_str])
raw = self.beacons[fun_str](b_config[mod])
except: # pylint: disable=bare-except
error = "{}".format(sys.exc_info()[1])